|
@@ -6,6 +6,7 @@ |
|
@@ -6,6 +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/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Member.php" 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" />
|
10
|
<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" />
|
10
|
</list>
|
11
|
</list>
|
11
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
12
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -34,24 +35,11 @@ |
|
@@ -34,24 +35,11 @@ |
34
|
</component>
|
35
|
</component>
|
35
|
<component name="FileEditorManager">
|
36
|
<component name="FileEditorManager">
|
36
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
37
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
37
|
- <file leaf-file-name="Member.php" pinned="false" current-in-tab="false">
|
38
|
+ <file leaf-file-name="Member.php" pinned="false" current-in-tab="true">
|
38
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
|
39
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
|
39
|
<provider selected="true" editor-type-id="text-editor">
|
40
|
<provider selected="true" editor-type-id="text-editor">
|
40
|
- <state relative-caret-position="544">
|
|
|
41
|
- <caret line="150" column="70" selection-start-line="150" selection-start-column="70" selection-end-line="150" selection-end-column="70" />
|
|
|
42
|
- </state>
|
|
|
43
|
- </provider>
|
|
|
44
|
- </entry>
|
|
|
45
|
- </file>
|
|
|
46
|
- <file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="true">
|
|
|
47
|
- <entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
|
|
48
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
49
|
- <state relative-caret-position="482">
|
|
|
50
|
- <caret line="218" column="47" selection-start-line="218" selection-start-column="47" selection-end-line="218" selection-end-column="47" />
|
|
|
51
|
- <folding>
|
|
|
52
|
- <element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
53
|
- <element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
54
|
- </folding>
|
41
|
+ <state relative-caret-position="493">
|
|
|
42
|
+ <caret line="156" column="19" selection-start-line="156" selection-start-column="19" selection-end-line="156" selection-end-column="19" />
|
55
|
</state>
|
43
|
</state>
|
56
|
</provider>
|
44
|
</provider>
|
57
|
</entry>
|
45
|
</entry>
|
|
@@ -106,7 +94,6 @@ |
|
@@ -106,7 +94,6 @@ |
106
|
</component>
|
94
|
</component>
|
107
|
<component name="FindInProjectRecents">
|
95
|
<component name="FindInProjectRecents">
|
108
|
<findStrings>
|
96
|
<findStrings>
|
109
|
- <find>is_where_satisfy</find>
|
|
|
110
|
<find>quest_ans</find>
|
97
|
<find>quest_ans</find>
|
111
|
<find>quest_condition</find>
|
98
|
<find>quest_condition</find>
|
112
|
<find>submit_btn_sure</find>
|
99
|
<find>submit_btn_sure</find>
|
|
@@ -136,6 +123,7 @@ |
|
@@ -136,6 +123,7 @@ |
136
|
<find>header_img</find>
|
123
|
<find>header_img</find>
|
137
|
<find>sexPicker</find>
|
124
|
<find>sexPicker</find>
|
138
|
<find>btn</find>
|
125
|
<find>btn</find>
|
|
|
126
|
+ <find>over</find>
|
139
|
</findStrings>
|
127
|
</findStrings>
|
140
|
<replaceStrings>
|
128
|
<replaceStrings>
|
141
|
<replace />
|
129
|
<replace />
|
|
@@ -196,8 +184,8 @@ |
|
@@ -196,8 +184,8 @@ |
196
|
<option value="$PROJECT_DIR$/application/home/controller/demo.xml" />
|
184
|
<option value="$PROJECT_DIR$/application/home/controller/demo.xml" />
|
197
|
<option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" />
|
185
|
<option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" />
|
198
|
<option value="$PROJECT_DIR$/public/assets/advertising/css/record.css" />
|
186
|
<option value="$PROJECT_DIR$/public/assets/advertising/css/record.css" />
|
199
|
- <option value="$PROJECT_DIR$/application/home/controller/Member.php" />
|
|
|
200
|
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
|
187
|
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
|
|
|
188
|
+ <option value="$PROJECT_DIR$/application/home/controller/Member.php" />
|
201
|
</list>
|
189
|
</list>
|
202
|
</option>
|
190
|
</option>
|
203
|
</component>
|
191
|
</component>
|
|
@@ -445,35 +433,7 @@ |
|
@@ -445,35 +433,7 @@ |
445
|
<workItem from="1572827640492" duration="25475000" />
|
433
|
<workItem from="1572827640492" duration="25475000" />
|
446
|
<workItem from="1572914713443" duration="29898000" />
|
434
|
<workItem from="1572914713443" duration="29898000" />
|
447
|
<workItem from="1573000530976" duration="6061000" />
|
435
|
<workItem from="1573000530976" duration="6061000" />
|
448
|
- <workItem from="1573087576825" duration="2874000" />
|
|
|
449
|
- </task>
|
|
|
450
|
- <task id="LOCAL-00192" summary="音频">
|
|
|
451
|
- <created>1572937831960</created>
|
|
|
452
|
- <option name="number" value="00192" />
|
|
|
453
|
- <option name="presentableId" value="LOCAL-00192" />
|
|
|
454
|
- <option name="project" value="LOCAL" />
|
|
|
455
|
- <updated>1572937831960</updated>
|
|
|
456
|
- </task>
|
|
|
457
|
- <task id="LOCAL-00193" summary="音频">
|
|
|
458
|
- <created>1572938036801</created>
|
|
|
459
|
- <option name="number" value="00193" />
|
|
|
460
|
- <option name="presentableId" value="LOCAL-00193" />
|
|
|
461
|
- <option name="project" value="LOCAL" />
|
|
|
462
|
- <updated>1572938036801</updated>
|
|
|
463
|
- </task>
|
|
|
464
|
- <task id="LOCAL-00194" summary="音频">
|
|
|
465
|
- <created>1572938246566</created>
|
|
|
466
|
- <option name="number" value="00194" />
|
|
|
467
|
- <option name="presentableId" value="LOCAL-00194" />
|
|
|
468
|
- <option name="project" value="LOCAL" />
|
|
|
469
|
- <updated>1572938246566</updated>
|
|
|
470
|
- </task>
|
|
|
471
|
- <task id="LOCAL-00195" summary="音频">
|
|
|
472
|
- <created>1572938779320</created>
|
|
|
473
|
- <option name="number" value="00195" />
|
|
|
474
|
- <option name="presentableId" value="LOCAL-00195" />
|
|
|
475
|
- <option name="project" value="LOCAL" />
|
|
|
476
|
- <updated>1572938779320</updated>
|
436
|
+ <workItem from="1573087576825" duration="4018000" />
|
477
|
</task>
|
437
|
</task>
|
478
|
<task id="LOCAL-00196" summary="音频">
|
438
|
<task id="LOCAL-00196" summary="音频">
|
479
|
<created>1572939048070</created>
|
439
|
<created>1572939048070</created>
|
|
@@ -790,11 +750,39 @@ |
|
@@ -790,11 +750,39 @@ |
790
|
<option name="project" value="LOCAL" />
|
750
|
<option name="project" value="LOCAL" />
|
791
|
<updated>1573124453294</updated>
|
751
|
<updated>1573124453294</updated>
|
792
|
</task>
|
752
|
</task>
|
793
|
- <option name="localTasksCounter" value="241" />
|
753
|
+ <task id="LOCAL-00241" summary="音频">
|
|
|
754
|
+ <created>1573124761821</created>
|
|
|
755
|
+ <option name="number" value="00241" />
|
|
|
756
|
+ <option name="presentableId" value="LOCAL-00241" />
|
|
|
757
|
+ <option name="project" value="LOCAL" />
|
|
|
758
|
+ <updated>1573124761821</updated>
|
|
|
759
|
+ </task>
|
|
|
760
|
+ <task id="LOCAL-00242" summary="音频">
|
|
|
761
|
+ <created>1573124899077</created>
|
|
|
762
|
+ <option name="number" value="00242" />
|
|
|
763
|
+ <option name="presentableId" value="LOCAL-00242" />
|
|
|
764
|
+ <option name="project" value="LOCAL" />
|
|
|
765
|
+ <updated>1573124899077</updated>
|
|
|
766
|
+ </task>
|
|
|
767
|
+ <task id="LOCAL-00243" summary="音频">
|
|
|
768
|
+ <created>1573124909044</created>
|
|
|
769
|
+ <option name="number" value="00243" />
|
|
|
770
|
+ <option name="presentableId" value="LOCAL-00243" />
|
|
|
771
|
+ <option name="project" value="LOCAL" />
|
|
|
772
|
+ <updated>1573124909044</updated>
|
|
|
773
|
+ </task>
|
|
|
774
|
+ <task id="LOCAL-00244" summary="音频">
|
|
|
775
|
+ <created>1573125129543</created>
|
|
|
776
|
+ <option name="number" value="00244" />
|
|
|
777
|
+ <option name="presentableId" value="LOCAL-00244" />
|
|
|
778
|
+ <option name="project" value="LOCAL" />
|
|
|
779
|
+ <updated>1573125129543</updated>
|
|
|
780
|
+ </task>
|
|
|
781
|
+ <option name="localTasksCounter" value="245" />
|
794
|
<servers />
|
782
|
<servers />
|
795
|
</component>
|
783
|
</component>
|
796
|
<component name="TimeTrackingManager">
|
784
|
<component name="TimeTrackingManager">
|
797
|
- <option name="totallyTimeSpent" value="338411000" />
|
785
|
+ <option name="totallyTimeSpent" value="339555000" />
|
798
|
</component>
|
786
|
</component>
|
799
|
<component name="ToolWindowManager">
|
787
|
<component name="ToolWindowManager">
|
800
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
788
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -1187,20 +1175,6 @@ |
|
@@ -1187,20 +1175,6 @@ |
1187
|
</state>
|
1175
|
</state>
|
1188
|
</provider>
|
1176
|
</provider>
|
1189
|
</entry>
|
1177
|
</entry>
|
1190
|
- <entry file="file://$PROJECT_DIR$/application/home/view/member/my_withdraw.html">
|
|
|
1191
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
1192
|
- <state relative-caret-position="646">
|
|
|
1193
|
- <caret line="41" column="36" selection-start-line="41" selection-start-column="36" selection-end-line="41" selection-end-column="36" />
|
|
|
1194
|
- </state>
|
|
|
1195
|
- </provider>
|
|
|
1196
|
- </entry>
|
|
|
1197
|
- <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
|
|
|
1198
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
1199
|
- <state relative-caret-position="544">
|
|
|
1200
|
- <caret line="150" column="70" selection-start-line="150" selection-start-column="70" selection-end-line="150" selection-end-column="70" />
|
|
|
1201
|
- </state>
|
|
|
1202
|
- </provider>
|
|
|
1203
|
- </entry>
|
|
|
1204
|
<entry file="file://$USER_HOME$/Desktop/userShopping/audioDetail.html">
|
1178
|
<entry file="file://$USER_HOME$/Desktop/userShopping/audioDetail.html">
|
1205
|
<provider selected="true" editor-type-id="text-editor">
|
1179
|
<provider selected="true" editor-type-id="text-editor">
|
1206
|
<state relative-caret-position="473">
|
1180
|
<state relative-caret-position="473">
|
|
@@ -1210,8 +1184,8 @@ |
|
@@ -1210,8 +1184,8 @@ |
1210
|
</entry>
|
1184
|
</entry>
|
1211
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
1185
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
1212
|
<provider selected="true" editor-type-id="text-editor">
|
1186
|
<provider selected="true" editor-type-id="text-editor">
|
1213
|
- <state relative-caret-position="482">
|
|
|
1214
|
- <caret line="218" column="47" selection-start-line="218" selection-start-column="47" selection-end-line="218" selection-end-column="47" />
|
1187
|
+ <state relative-caret-position="652">
|
|
|
1188
|
+ <caret line="237" column="27" selection-start-line="237" selection-start-column="27" selection-end-line="237" selection-end-column="27" />
|
1215
|
<folding>
|
1189
|
<folding>
|
1216
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
1190
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
1217
|
<element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
1191
|
<element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
@@ -1219,6 +1193,20 @@ |
|
@@ -1219,6 +1193,20 @@ |
1219
|
</state>
|
1193
|
</state>
|
1220
|
</provider>
|
1194
|
</provider>
|
1221
|
</entry>
|
1195
|
</entry>
|
|
|
1196
|
+ <entry file="file://$PROJECT_DIR$/application/home/view/member/my_withdraw.html">
|
|
|
1197
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1198
|
+ <state relative-caret-position="646">
|
|
|
1199
|
+ <caret line="41" column="36" selection-start-line="41" selection-start-column="36" selection-end-line="41" selection-end-column="36" />
|
|
|
1200
|
+ </state>
|
|
|
1201
|
+ </provider>
|
|
|
1202
|
+ </entry>
|
|
|
1203
|
+ <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
|
|
|
1204
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1205
|
+ <state relative-caret-position="493">
|
|
|
1206
|
+ <caret line="156" column="19" selection-start-line="156" selection-start-column="19" selection-end-line="156" selection-end-column="19" />
|
|
|
1207
|
+ </state>
|
|
|
1208
|
+ </provider>
|
|
|
1209
|
+ </entry>
|
1222
|
</component>
|
1210
|
</component>
|
1223
|
<component name="masterDetails">
|
1211
|
<component name="masterDetails">
|
1224
|
<states>
|
1212
|
<states>
|