|
@@ -2,12 +2,7 @@ |
|
@@ -2,12 +2,7 @@ |
2
|
<project version="4">
|
2
|
<project version="4">
|
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" />
|
|
|
6
|
- <change beforePath="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" afterDir="false" />
|
|
|
7
|
- <change beforePath="$PROJECT_DIR$/application/admin/view/goods/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods/index.html" afterDir="false" />
|
|
|
8
|
- <change beforePath="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" afterDir="false" />
|
|
|
9
|
- <change beforePath="$PROJECT_DIR$/public/assets/js/backend/goods.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/goods.js" afterDir="false" />
|
|
|
10
|
- <change beforePath="$PROJECT_DIR$/public/assets/js/backend/goods_audit.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/goods_audit.js" afterDir="false" />
|
5
|
+ <change beforePath="$PROJECT_DIR$/application/admin/controller/PayView.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/PayView.php" afterDir="false" />
|
11
|
</list>
|
6
|
</list>
|
12
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
7
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
13
|
<option name="TRACKING_ENABLED" value="true" />
|
8
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -21,53 +16,23 @@ |
|
@@ -21,53 +16,23 @@ |
21
|
</component>
|
16
|
</component>
|
22
|
<component name="FileEditorManager">
|
17
|
<component name="FileEditorManager">
|
23
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
18
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
24
|
- <file leaf-file-name="UserExpLogAudit.php" pinned="false" current-in-tab="true">
|
|
|
25
|
- <entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
|
19
|
+ <file leaf-file-name="PayView.php" pinned="false" current-in-tab="true">
|
|
|
20
|
+ <entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
|
26
|
<provider selected="true" editor-type-id="text-editor">
|
21
|
<provider selected="true" editor-type-id="text-editor">
|
27
|
- <state relative-caret-position="334">
|
|
|
28
|
- <caret line="121" lean-forward="true" selection-start-line="121" selection-end-line="121" />
|
22
|
+ <state relative-caret-position="527">
|
|
|
23
|
+ <caret line="69" column="15" selection-start-line="69" selection-start-column="15" selection-end-line="69" selection-end-column="15" />
|
29
|
<folding>
|
24
|
<folding>
|
30
|
- <element signature="e#40#74#0#PHP" expanded="true" />
|
25
|
+ <element signature="e#129#163#0#PHP" expanded="true" />
|
31
|
</folding>
|
26
|
</folding>
|
32
|
</state>
|
27
|
</state>
|
33
|
</provider>
|
28
|
</provider>
|
34
|
</entry>
|
29
|
</entry>
|
35
|
</file>
|
30
|
</file>
|
36
|
- <file leaf-file-name="UserMoneyLogAudit.php" pinned="false" current-in-tab="false">
|
|
|
37
|
- <entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
|
31
|
+ <file leaf-file-name="MerchantAudit.php" pinned="false" current-in-tab="false">
|
|
|
32
|
+ <entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
|
38
|
<provider selected="true" editor-type-id="text-editor">
|
33
|
<provider selected="true" editor-type-id="text-editor">
|
39
|
- <state relative-caret-position="776">
|
|
|
40
|
- <caret line="178" column="5" lean-forward="true" selection-start-line="82" selection-start-column="4" selection-end-line="178" selection-end-column="5" />
|
|
|
41
|
- <folding>
|
|
|
42
|
- <element signature="e#40#74#0#PHP" expanded="true" />
|
|
|
43
|
- </folding>
|
|
|
44
|
- </state>
|
|
|
45
|
- </provider>
|
|
|
46
|
- </entry>
|
|
|
47
|
- </file>
|
|
|
48
|
- <file leaf-file-name="user_exp_log_audit.js" pinned="false" current-in-tab="false">
|
|
|
49
|
- <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_exp_log_audit.js">
|
|
|
50
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
51
|
- <state relative-caret-position="303">
|
|
|
52
|
- <caret line="31" column="61" selection-start-line="31" selection-start-column="61" selection-end-line="31" selection-end-column="61" />
|
|
|
53
|
- </state>
|
|
|
54
|
- </provider>
|
|
|
55
|
- </entry>
|
|
|
56
|
- </file>
|
|
|
57
|
- <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
|
|
|
58
|
- <entry file="file://$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html">
|
|
|
59
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
60
|
- <state relative-caret-position="102">
|
|
|
61
|
- <caret line="6" column="35" selection-start-line="6" selection-start-column="35" selection-end-line="6" selection-end-column="35" />
|
|
|
62
|
- </state>
|
|
|
63
|
- </provider>
|
|
|
64
|
- </entry>
|
|
|
65
|
- </file>
|
|
|
66
|
- <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
|
|
67
|
- <entry file="file://$PROJECT_DIR$/application/admin/view/user_exp_log_audit/index.html">
|
|
|
68
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
69
|
- <state relative-caret-position="340">
|
|
|
70
|
- <caret line="20" column="33" lean-forward="true" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
|
34
|
+ <state relative-caret-position="544">
|
|
|
35
|
+ <caret line="139" column="68" selection-start-line="139" selection-start-column="68" selection-end-line="139" selection-end-column="68" />
|
71
|
</state>
|
36
|
</state>
|
72
|
</provider>
|
37
|
</provider>
|
73
|
</entry>
|
38
|
</entry>
|
|
@@ -112,7 +77,6 @@ |
|
@@ -112,7 +77,6 @@ |
112
|
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log.js" />
|
77
|
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log.js" />
|
113
|
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html" />
|
78
|
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html" />
|
114
|
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js" />
|
79
|
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js" />
|
115
|
- <option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
|
|
|
116
|
<option value="$PROJECT_DIR$/application/extra/wechat.php" />
|
80
|
<option value="$PROJECT_DIR$/application/extra/wechat.php" />
|
117
|
<option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" />
|
81
|
<option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" />
|
118
|
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
|
82
|
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
|
|
@@ -127,7 +91,6 @@ |
|
@@ -127,7 +91,6 @@ |
127
|
<option value="$PROJECT_DIR$/public/assets/js/backend/goods_audit.js" />
|
91
|
<option value="$PROJECT_DIR$/public/assets/js/backend/goods_audit.js" />
|
128
|
<option value="$PROJECT_DIR$/application/admin/view/order/index.html" />
|
92
|
<option value="$PROJECT_DIR$/application/admin/view/order/index.html" />
|
129
|
<option value="$PROJECT_DIR$/application/admin/controller/MerchantGoods.php" />
|
93
|
<option value="$PROJECT_DIR$/application/admin/controller/MerchantGoods.php" />
|
130
|
- <option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
|
|
|
131
|
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
|
94
|
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
|
132
|
<option value="$PROJECT_DIR$/application/admin/view/order/edit.html" />
|
95
|
<option value="$PROJECT_DIR$/application/admin/view/order/edit.html" />
|
133
|
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
|
96
|
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
|
|
@@ -142,6 +105,8 @@ |
|
@@ -142,6 +105,8 @@ |
142
|
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" />
|
105
|
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" />
|
143
|
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
|
106
|
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
|
144
|
<option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
|
107
|
<option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
|
|
|
108
|
+ <option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
|
|
|
109
|
+ <option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
|
145
|
</list>
|
110
|
</list>
|
146
|
</option>
|
111
|
</option>
|
147
|
</component>
|
112
|
</component>
|
|
@@ -352,7 +317,7 @@ |
|
@@ -352,7 +317,7 @@ |
352
|
<workItem from="1572087949120" duration="1641000" />
|
317
|
<workItem from="1572087949120" duration="1641000" />
|
353
|
<workItem from="1572223206994" duration="28857000" />
|
318
|
<workItem from="1572223206994" duration="28857000" />
|
354
|
<workItem from="1572309778506" duration="26117000" />
|
319
|
<workItem from="1572309778506" duration="26117000" />
|
355
|
- <workItem from="1572395935540" duration="25703000" />
|
320
|
+ <workItem from="1572395935540" duration="27417000" />
|
356
|
</task>
|
321
|
</task>
|
357
|
<task id="LOCAL-00001" summary="数据库配置">
|
322
|
<task id="LOCAL-00001" summary="数据库配置">
|
358
|
<created>1571972429395</created>
|
323
|
<created>1571972429395</created>
|
|
@@ -596,7 +561,7 @@ |
|
@@ -596,7 +561,7 @@ |
596
|
<servers />
|
561
|
<servers />
|
597
|
</component>
|
562
|
</component>
|
598
|
<component name="TimeTrackingManager">
|
563
|
<component name="TimeTrackingManager">
|
599
|
- <option name="totallyTimeSpent" value="210928000" />
|
564
|
+ <option name="totallyTimeSpent" value="212642000" />
|
600
|
</component>
|
565
|
</component>
|
601
|
<component name="ToolWindowManager">
|
566
|
<component name="ToolWindowManager">
|
602
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
567
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -731,16 +696,6 @@ |
|
@@ -731,16 +696,6 @@ |
731
|
</state>
|
696
|
</state>
|
732
|
</provider>
|
697
|
</provider>
|
733
|
</entry>
|
698
|
</entry>
|
734
|
- <entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
|
|
|
735
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
736
|
- <state relative-caret-position="544">
|
|
|
737
|
- <caret line="52" column="55" selection-start-line="52" selection-start-column="24" selection-end-line="52" selection-end-column="55" />
|
|
|
738
|
- <folding>
|
|
|
739
|
- <element signature="e#129#163#0#PHP" expanded="true" />
|
|
|
740
|
- </folding>
|
|
|
741
|
- </state>
|
|
|
742
|
- </provider>
|
|
|
743
|
- </entry>
|
|
|
744
|
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
|
699
|
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
|
745
|
<provider selected="true" editor-type-id="text-editor">
|
700
|
<provider selected="true" editor-type-id="text-editor">
|
746
|
<state relative-caret-position="833">
|
701
|
<state relative-caret-position="833">
|
|
@@ -943,13 +898,6 @@ |
|
@@ -943,13 +898,6 @@ |
943
|
</state>
|
898
|
</state>
|
944
|
</provider>
|
899
|
</provider>
|
945
|
</entry>
|
900
|
</entry>
|
946
|
- <entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
|
|
|
947
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
948
|
- <state relative-caret-position="323">
|
|
|
949
|
- <caret line="21" column="45" selection-start-line="21" selection-start-column="45" selection-end-line="21" selection-end-column="89" />
|
|
|
950
|
- </state>
|
|
|
951
|
- </provider>
|
|
|
952
|
- </entry>
|
|
|
953
|
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
|
901
|
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
|
954
|
<provider selected="true" editor-type-id="text-editor">
|
902
|
<provider selected="true" editor-type-id="text-editor">
|
955
|
<state relative-caret-position="748">
|
903
|
<state relative-caret-position="748">
|
|
@@ -1046,14 +994,31 @@ |
|
@@ -1046,14 +994,31 @@ |
1046
|
</entry>
|
994
|
</entry>
|
1047
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
|
995
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
|
1048
|
<provider selected="true" editor-type-id="text-editor">
|
996
|
<provider selected="true" editor-type-id="text-editor">
|
1049
|
- <state relative-caret-position="334">
|
|
|
1050
|
- <caret line="121" lean-forward="true" selection-start-line="121" selection-end-line="121" />
|
997
|
+ <state relative-caret-position="453">
|
|
|
998
|
+ <caret line="131" column="44" lean-forward="true" selection-start-line="131" selection-start-column="44" selection-end-line="131" selection-end-column="44" />
|
1051
|
<folding>
|
999
|
<folding>
|
1052
|
<element signature="e#40#74#0#PHP" expanded="true" />
|
1000
|
<element signature="e#40#74#0#PHP" expanded="true" />
|
1053
|
</folding>
|
1001
|
</folding>
|
1054
|
</state>
|
1002
|
</state>
|
1055
|
</provider>
|
1003
|
</provider>
|
1056
|
</entry>
|
1004
|
</entry>
|
|
|
1005
|
+ <entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
|
|
|
1006
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1007
|
+ <state relative-caret-position="544">
|
|
|
1008
|
+ <caret line="139" column="68" selection-start-line="139" selection-start-column="68" selection-end-line="139" selection-end-column="68" />
|
|
|
1009
|
+ </state>
|
|
|
1010
|
+ </provider>
|
|
|
1011
|
+ </entry>
|
|
|
1012
|
+ <entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
|
|
|
1013
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1014
|
+ <state relative-caret-position="527">
|
|
|
1015
|
+ <caret line="69" column="15" selection-start-line="69" selection-start-column="15" selection-end-line="69" selection-end-column="15" />
|
|
|
1016
|
+ <folding>
|
|
|
1017
|
+ <element signature="e#129#163#0#PHP" expanded="true" />
|
|
|
1018
|
+ </folding>
|
|
|
1019
|
+ </state>
|
|
|
1020
|
+ </provider>
|
|
|
1021
|
+ </entry>
|
1057
|
</component>
|
1022
|
</component>
|
1058
|
<component name="masterDetails">
|
1023
|
<component name="masterDetails">
|
1059
|
<states>
|
1024
|
<states>
|