|
@@ -6,7 +6,7 @@ |
|
@@ -6,7 +6,7 @@ |
6
|
<component name="ChangeListManager">
|
6
|
<component name="ChangeListManager">
|
7
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
7
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
8
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
8
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
9
|
- <change beforePath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" afterDir="false" />
|
9
|
+ <change beforePath="$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html" afterDir="false" />
|
10
|
</list>
|
10
|
</list>
|
11
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
11
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
12
|
<option name="TRACKING_ENABLED" value="true" />
|
12
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -34,29 +34,11 @@ |
|
@@ -34,29 +34,11 @@ |
34
|
</component>
|
34
|
</component>
|
35
|
<component name="FileEditorManager">
|
35
|
<component name="FileEditorManager">
|
36
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
36
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
37
|
- <file leaf-file-name="my_withdraw.html" pinned="false" current-in-tab="false">
|
|
|
38
|
- <entry file="file://$PROJECT_DIR$/application/home/view/member/my_withdraw.html">
|
|
|
39
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
40
|
- <state relative-caret-position="-221">
|
|
|
41
|
- <caret line="29" column="65" selection-start-line="29" selection-start-column="65" selection-end-line="29" selection-end-column="65" />
|
|
|
42
|
- </state>
|
|
|
43
|
- </provider>
|
|
|
44
|
- </entry>
|
|
|
45
|
- </file>
|
|
|
46
|
- <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
|
|
47
|
- <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
|
|
48
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
49
|
- <state relative-caret-position="373">
|
|
|
50
|
- <caret line="50" column="22" lean-forward="true" selection-start-line="50" selection-start-column="22" selection-end-line="50" selection-end-column="22" />
|
|
|
51
|
- </state>
|
|
|
52
|
- </provider>
|
|
|
53
|
- </entry>
|
|
|
54
|
- </file>
|
|
|
55
|
- <file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="true">
|
37
|
+ <file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="false">
|
56
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
38
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
57
|
<provider selected="true" editor-type-id="text-editor">
|
39
|
<provider selected="true" editor-type-id="text-editor">
|
58
|
- <state relative-caret-position="286">
|
|
|
59
|
- <caret line="178" column="29" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" />
|
40
|
+ <state relative-caret-position="303">
|
|
|
41
|
+ <caret line="176" column="34" selection-start-line="176" selection-start-column="34" selection-end-line="176" selection-end-column="34" />
|
60
|
<folding>
|
42
|
<folding>
|
61
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
43
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
62
|
</folding>
|
44
|
</folding>
|
|
@@ -64,20 +46,15 @@ |
|
@@ -64,20 +46,15 @@ |
64
|
</provider>
|
46
|
</provider>
|
65
|
</entry>
|
47
|
</entry>
|
66
|
</file>
|
48
|
</file>
|
67
|
- <file leaf-file-name="record.css" pinned="false" current-in-tab="false">
|
|
|
68
|
- <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/record.css">
|
49
|
+ <file leaf-file-name="edit.html" pinned="false" current-in-tab="true">
|
|
|
50
|
+ <entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
|
69
|
<provider selected="true" editor-type-id="text-editor">
|
51
|
<provider selected="true" editor-type-id="text-editor">
|
70
|
- <state relative-caret-position="288">
|
|
|
71
|
- <caret line="116" column="16" selection-start-line="116" selection-start-column="16" selection-end-line="116" selection-end-column="16" />
|
52
|
+ <state relative-caret-position="528">
|
|
|
53
|
+ <caret line="51" column="52" selection-start-line="51" selection-start-column="52" selection-end-line="51" selection-end-column="52" />
|
72
|
</state>
|
54
|
</state>
|
73
|
</provider>
|
55
|
</provider>
|
74
|
</entry>
|
56
|
</entry>
|
75
|
</file>
|
57
|
</file>
|
76
|
- <file leaf-file-name="my_wallet.html" pinned="false" current-in-tab="false">
|
|
|
77
|
- <entry file="file://$PROJECT_DIR$/application/home/view/member/my_wallet.html">
|
|
|
78
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
79
|
- </entry>
|
|
|
80
|
- </file>
|
|
|
81
|
</leaf>
|
58
|
</leaf>
|
82
|
</component>
|
59
|
</component>
|
83
|
<component name="FileTemplateManagerImpl">
|
60
|
<component name="FileTemplateManagerImpl">
|
|
@@ -172,7 +149,6 @@ |
|
@@ -172,7 +149,6 @@ |
172
|
<option value="$PROJECT_DIR$/application/admin/view/slide/edit.html" />
|
149
|
<option value="$PROJECT_DIR$/application/admin/view/slide/edit.html" />
|
173
|
<option value="$PROJECT_DIR$/application/admin/view/slide/add.html" />
|
150
|
<option value="$PROJECT_DIR$/application/admin/view/slide/add.html" />
|
174
|
<option value="$PROJECT_DIR$/public/assets/js/backend/slide.js" />
|
151
|
<option value="$PROJECT_DIR$/public/assets/js/backend/slide.js" />
|
175
|
- <option value="$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html" />
|
|
|
176
|
<option value="$PROJECT_DIR$/application/admin/controller/Dashboard.php" />
|
152
|
<option value="$PROJECT_DIR$/application/admin/controller/Dashboard.php" />
|
177
|
<option value="$PROJECT_DIR$/application/admin/view/common/header.html" />
|
153
|
<option value="$PROJECT_DIR$/application/admin/view/common/header.html" />
|
178
|
<option value="$PROJECT_DIR$/application/admin/view/common/menu.html" />
|
154
|
<option value="$PROJECT_DIR$/application/admin/view/common/menu.html" />
|
|
@@ -181,6 +157,7 @@ |
|
@@ -181,6 +157,7 @@ |
181
|
<option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" />
|
157
|
<option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" />
|
182
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
158
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
183
|
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
|
159
|
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
|
|
|
160
|
+ <option value="$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html" />
|
184
|
</list>
|
161
|
</list>
|
185
|
</option>
|
162
|
</option>
|
186
|
</component>
|
163
|
</component>
|
|
@@ -429,35 +406,7 @@ |
|
@@ -429,35 +406,7 @@ |
429
|
<workItem from="1573259331081" duration="30435000" />
|
406
|
<workItem from="1573259331081" duration="30435000" />
|
430
|
<workItem from="1573432217070" duration="2199000" />
|
407
|
<workItem from="1573432217070" duration="2199000" />
|
431
|
<workItem from="1573519427130" duration="17475000" />
|
408
|
<workItem from="1573519427130" duration="17475000" />
|
432
|
- <workItem from="1573605070739" duration="17752000" />
|
|
|
433
|
- </task>
|
|
|
434
|
- <task id="LOCAL-00596" summary=" 商户申请">
|
|
|
435
|
- <created>1573562145766</created>
|
|
|
436
|
- <option name="number" value="00596" />
|
|
|
437
|
- <option name="presentableId" value="LOCAL-00596" />
|
|
|
438
|
- <option name="project" value="LOCAL" />
|
|
|
439
|
- <updated>1573562145766</updated>
|
|
|
440
|
- </task>
|
|
|
441
|
- <task id="LOCAL-00597" summary=" 商户申请">
|
|
|
442
|
- <created>1573562164520</created>
|
|
|
443
|
- <option name="number" value="00597" />
|
|
|
444
|
- <option name="presentableId" value="LOCAL-00597" />
|
|
|
445
|
- <option name="project" value="LOCAL" />
|
|
|
446
|
- <updated>1573562164520</updated>
|
|
|
447
|
- </task>
|
|
|
448
|
- <task id="LOCAL-00598" summary=" 商户申请">
|
|
|
449
|
- <created>1573562241873</created>
|
|
|
450
|
- <option name="number" value="00598" />
|
|
|
451
|
- <option name="presentableId" value="LOCAL-00598" />
|
|
|
452
|
- <option name="project" value="LOCAL" />
|
|
|
453
|
- <updated>1573562241873</updated>
|
|
|
454
|
- </task>
|
|
|
455
|
- <task id="LOCAL-00599" summary=" 商户申请">
|
|
|
456
|
- <created>1573562324144</created>
|
|
|
457
|
- <option name="number" value="00599" />
|
|
|
458
|
- <option name="presentableId" value="LOCAL-00599" />
|
|
|
459
|
- <option name="project" value="LOCAL" />
|
|
|
460
|
- <updated>1573562324144</updated>
|
409
|
+ <workItem from="1573605070739" duration="18476000" />
|
461
|
</task>
|
410
|
</task>
|
462
|
<task id="LOCAL-00600" summary=" 商户申请">
|
411
|
<task id="LOCAL-00600" summary=" 商户申请">
|
463
|
<created>1573562410823</created>
|
412
|
<created>1573562410823</created>
|
|
@@ -774,11 +723,39 @@ |
|
@@ -774,11 +723,39 @@ |
774
|
<option name="project" value="LOCAL" />
|
723
|
<option name="project" value="LOCAL" />
|
775
|
<updated>1573633945901</updated>
|
724
|
<updated>1573633945901</updated>
|
776
|
</task>
|
725
|
</task>
|
777
|
- <option name="localTasksCounter" value="645" />
|
726
|
+ <task id="LOCAL-00645" summary="后台bug">
|
|
|
727
|
+ <created>1573633977584</created>
|
|
|
728
|
+ <option name="number" value="00645" />
|
|
|
729
|
+ <option name="presentableId" value="LOCAL-00645" />
|
|
|
730
|
+ <option name="project" value="LOCAL" />
|
|
|
731
|
+ <updated>1573633977584</updated>
|
|
|
732
|
+ </task>
|
|
|
733
|
+ <task id="LOCAL-00646" summary="后台bug">
|
|
|
734
|
+ <created>1573634041029</created>
|
|
|
735
|
+ <option name="number" value="00646" />
|
|
|
736
|
+ <option name="presentableId" value="LOCAL-00646" />
|
|
|
737
|
+ <option name="project" value="LOCAL" />
|
|
|
738
|
+ <updated>1573634041029</updated>
|
|
|
739
|
+ </task>
|
|
|
740
|
+ <task id="LOCAL-00647" summary="后台bug">
|
|
|
741
|
+ <created>1573634111454</created>
|
|
|
742
|
+ <option name="number" value="00647" />
|
|
|
743
|
+ <option name="presentableId" value="LOCAL-00647" />
|
|
|
744
|
+ <option name="project" value="LOCAL" />
|
|
|
745
|
+ <updated>1573634111454</updated>
|
|
|
746
|
+ </task>
|
|
|
747
|
+ <task id="LOCAL-00648" summary="后台bug">
|
|
|
748
|
+ <created>1573634195472</created>
|
|
|
749
|
+ <option name="number" value="00648" />
|
|
|
750
|
+ <option name="presentableId" value="LOCAL-00648" />
|
|
|
751
|
+ <option name="project" value="LOCAL" />
|
|
|
752
|
+ <updated>1573634195472</updated>
|
|
|
753
|
+ </task>
|
|
|
754
|
+ <option name="localTasksCounter" value="649" />
|
778
|
<servers />
|
755
|
<servers />
|
779
|
</component>
|
756
|
</component>
|
780
|
<component name="TimeTrackingManager">
|
757
|
<component name="TimeTrackingManager">
|
781
|
- <option name="totallyTimeSpent" value="441534000" />
|
758
|
+ <option name="totallyTimeSpent" value="442258000" />
|
782
|
</component>
|
759
|
</component>
|
783
|
<component name="ToolWindowManager">
|
760
|
<component name="ToolWindowManager">
|
784
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
761
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -1090,9 +1067,6 @@ |
|
@@ -1090,9 +1067,6 @@ |
1090
|
</state>
|
1067
|
</state>
|
1091
|
</provider>
|
1068
|
</provider>
|
1092
|
</entry>
|
1069
|
</entry>
|
1093
|
- <entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/index.html">
|
|
|
1094
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
1095
|
- </entry>
|
|
|
1096
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
|
1070
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
|
1097
|
<provider selected="true" editor-type-id="text-editor">
|
1071
|
<provider selected="true" editor-type-id="text-editor">
|
1098
|
<state relative-caret-position="256">
|
1072
|
<state relative-caret-position="256">
|
|
@@ -1136,13 +1110,6 @@ |
|
@@ -1136,13 +1110,6 @@ |
1136
|
</state>
|
1110
|
</state>
|
1137
|
</provider>
|
1111
|
</provider>
|
1138
|
</entry>
|
1112
|
</entry>
|
1139
|
- <entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
|
|
|
1140
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
1141
|
- <state relative-caret-position="867">
|
|
|
1142
|
- <caret line="51" column="16" selection-start-line="51" selection-start-column="16" selection-end-line="62" selection-end-column="27" />
|
|
|
1143
|
- </state>
|
|
|
1144
|
- </provider>
|
|
|
1145
|
- </entry>
|
|
|
1146
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Dashboard.php">
|
1113
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Dashboard.php">
|
1147
|
<provider selected="true" editor-type-id="text-editor">
|
1114
|
<provider selected="true" editor-type-id="text-editor">
|
1148
|
<state relative-caret-position="725">
|
1115
|
<state relative-caret-position="725">
|
|
@@ -1183,16 +1150,26 @@ |
|
@@ -1183,16 +1150,26 @@ |
1183
|
</state>
|
1150
|
</state>
|
1184
|
</provider>
|
1151
|
</provider>
|
1185
|
</entry>
|
1152
|
</entry>
|
|
|
1153
|
+ <entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/index.html">
|
|
|
1154
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
1155
|
+ </entry>
|
1186
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
1156
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
1187
|
<provider selected="true" editor-type-id="text-editor">
|
1157
|
<provider selected="true" editor-type-id="text-editor">
|
1188
|
- <state relative-caret-position="286">
|
|
|
1189
|
- <caret line="178" column="29" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" />
|
1158
|
+ <state relative-caret-position="303">
|
|
|
1159
|
+ <caret line="176" column="34" selection-start-line="176" selection-start-column="34" selection-end-line="176" selection-end-column="34" />
|
1190
|
<folding>
|
1160
|
<folding>
|
1191
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
1161
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
1192
|
</folding>
|
1162
|
</folding>
|
1193
|
</state>
|
1163
|
</state>
|
1194
|
</provider>
|
1164
|
</provider>
|
1195
|
</entry>
|
1165
|
</entry>
|
|
|
1166
|
+ <entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
|
|
|
1167
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1168
|
+ <state relative-caret-position="528">
|
|
|
1169
|
+ <caret line="51" column="52" selection-start-line="51" selection-start-column="52" selection-end-line="51" selection-end-column="52" />
|
|
|
1170
|
+ </state>
|
|
|
1171
|
+ </provider>
|
|
|
1172
|
+ </entry>
|
1196
|
</component>
|
1173
|
</component>
|
1197
|
<component name="masterDetails">
|
1174
|
<component name="masterDetails">
|
1198
|
<states>
|
1175
|
<states>
|