|
@@ -5,6 +5,7 @@ |
|
@@ -5,6 +5,7 @@ |
5
|
</component>
|
5
|
</component>
|
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$/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/home/view/goods/audio_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" afterDir="false" />
|
9
|
</list>
|
10
|
</list>
|
10
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
11
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -93,8 +94,8 @@ |
|
@@ -93,8 +94,8 @@ |
93
|
<file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="true">
|
94
|
<file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="true">
|
94
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
95
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
95
|
<provider selected="true" editor-type-id="text-editor">
|
96
|
<provider selected="true" editor-type-id="text-editor">
|
96
|
- <state relative-caret-position="747">
|
|
|
97
|
- <caret line="329" column="17" lean-forward="true" selection-start-line="329" selection-start-column="17" selection-end-line="329" selection-end-column="17" />
|
97
|
+ <state relative-caret-position="254">
|
|
|
98
|
+ <caret line="314" column="33" selection-start-line="314" selection-start-column="33" selection-end-line="314" selection-end-column="33" />
|
98
|
<folding>
|
99
|
<folding>
|
99
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
100
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
100
|
</folding>
|
101
|
</folding>
|
|
@@ -132,7 +133,6 @@ |
|
@@ -132,7 +133,6 @@ |
132
|
</component>
|
133
|
</component>
|
133
|
<component name="FindInProjectRecents">
|
134
|
<component name="FindInProjectRecents">
|
134
|
<findStrings>
|
135
|
<findStrings>
|
135
|
- <find>#D12324</find>
|
|
|
136
|
<find>answer_word</find>
|
136
|
<find>answer_word</find>
|
137
|
<find>vide</find>
|
137
|
<find>vide</find>
|
138
|
<find>nav_img</find>
|
138
|
<find>nav_img</find>
|
|
@@ -162,6 +162,7 @@ |
|
@@ -162,6 +162,7 @@ |
162
|
<find>business_images</find>
|
162
|
<find>business_images</find>
|
163
|
<find>与服务器断开连接</find>
|
163
|
<find>与服务器断开连接</find>
|
164
|
<find>与服务器断开连接3</find>
|
164
|
<find>与服务器断开连接3</find>
|
|
|
165
|
+ <find>quest_condition</find>
|
165
|
</findStrings>
|
166
|
</findStrings>
|
166
|
<replaceStrings>
|
167
|
<replaceStrings>
|
167
|
<replace />
|
168
|
<replace />
|
|
@@ -496,28 +497,7 @@ |
|
@@ -496,28 +497,7 @@ |
496
|
<workItem from="1573174620844" duration="32581000" />
|
497
|
<workItem from="1573174620844" duration="32581000" />
|
497
|
<workItem from="1573259331081" duration="30435000" />
|
498
|
<workItem from="1573259331081" duration="30435000" />
|
498
|
<workItem from="1573432217070" duration="2199000" />
|
499
|
<workItem from="1573432217070" duration="2199000" />
|
499
|
- <workItem from="1573519427130" duration="4238000" />
|
|
|
500
|
- </task>
|
|
|
501
|
- <task id="LOCAL-00504" summary=" 商户申请">
|
|
|
502
|
- <created>1573284036394</created>
|
|
|
503
|
- <option name="number" value="00504" />
|
|
|
504
|
- <option name="presentableId" value="LOCAL-00504" />
|
|
|
505
|
- <option name="project" value="LOCAL" />
|
|
|
506
|
- <updated>1573284036394</updated>
|
|
|
507
|
- </task>
|
|
|
508
|
- <task id="LOCAL-00505" summary=" 商户申请">
|
|
|
509
|
- <created>1573284984083</created>
|
|
|
510
|
- <option name="number" value="00505" />
|
|
|
511
|
- <option name="presentableId" value="LOCAL-00505" />
|
|
|
512
|
- <option name="project" value="LOCAL" />
|
|
|
513
|
- <updated>1573284984083</updated>
|
|
|
514
|
- </task>
|
|
|
515
|
- <task id="LOCAL-00506" summary=" 商户申请">
|
|
|
516
|
- <created>1573286104682</created>
|
|
|
517
|
- <option name="number" value="00506" />
|
|
|
518
|
- <option name="presentableId" value="LOCAL-00506" />
|
|
|
519
|
- <option name="project" value="LOCAL" />
|
|
|
520
|
- <updated>1573286104682</updated>
|
500
|
+ <workItem from="1573519427130" duration="4554000" />
|
521
|
</task>
|
501
|
</task>
|
522
|
<task id="LOCAL-00507" summary=" 商户申请">
|
502
|
<task id="LOCAL-00507" summary=" 商户申请">
|
523
|
<created>1573286413188</created>
|
503
|
<created>1573286413188</created>
|
|
@@ -841,11 +821,32 @@ |
|
@@ -841,11 +821,32 @@ |
841
|
<option name="project" value="LOCAL" />
|
821
|
<option name="project" value="LOCAL" />
|
842
|
<updated>1573526757451</updated>
|
822
|
<updated>1573526757451</updated>
|
843
|
</task>
|
823
|
</task>
|
844
|
- <option name="localTasksCounter" value="553" />
|
824
|
+ <task id="LOCAL-00553" summary=" 商户申请">
|
|
|
825
|
+ <created>1573526837622</created>
|
|
|
826
|
+ <option name="number" value="00553" />
|
|
|
827
|
+ <option name="presentableId" value="LOCAL-00553" />
|
|
|
828
|
+ <option name="project" value="LOCAL" />
|
|
|
829
|
+ <updated>1573526837622</updated>
|
|
|
830
|
+ </task>
|
|
|
831
|
+ <task id="LOCAL-00554" summary=" 商户申请">
|
|
|
832
|
+ <created>1573526885516</created>
|
|
|
833
|
+ <option name="number" value="00554" />
|
|
|
834
|
+ <option name="presentableId" value="LOCAL-00554" />
|
|
|
835
|
+ <option name="project" value="LOCAL" />
|
|
|
836
|
+ <updated>1573526885516</updated>
|
|
|
837
|
+ </task>
|
|
|
838
|
+ <task id="LOCAL-00555" summary=" 商户申请">
|
|
|
839
|
+ <created>1573527096735</created>
|
|
|
840
|
+ <option name="number" value="00555" />
|
|
|
841
|
+ <option name="presentableId" value="LOCAL-00555" />
|
|
|
842
|
+ <option name="project" value="LOCAL" />
|
|
|
843
|
+ <updated>1573527096735</updated>
|
|
|
844
|
+ </task>
|
|
|
845
|
+ <option name="localTasksCounter" value="556" />
|
845
|
<servers />
|
846
|
<servers />
|
846
|
</component>
|
847
|
</component>
|
847
|
<component name="TimeTrackingManager">
|
848
|
<component name="TimeTrackingManager">
|
848
|
- <option name="totallyTimeSpent" value="410545000" />
|
849
|
+ <option name="totallyTimeSpent" value="410861000" />
|
849
|
</component>
|
850
|
</component>
|
850
|
<component name="ToolWindowManager">
|
851
|
<component name="ToolWindowManager">
|
851
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
852
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -1228,8 +1229,8 @@ |
|
@@ -1228,8 +1229,8 @@ |
1228
|
</entry>
|
1229
|
</entry>
|
1229
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
1230
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
1230
|
<provider selected="true" editor-type-id="text-editor">
|
1231
|
<provider selected="true" editor-type-id="text-editor">
|
1231
|
- <state relative-caret-position="747">
|
|
|
1232
|
- <caret line="329" column="17" lean-forward="true" selection-start-line="329" selection-start-column="17" selection-end-line="329" selection-end-column="17" />
|
1232
|
+ <state relative-caret-position="254">
|
|
|
1233
|
+ <caret line="314" column="33" selection-start-line="314" selection-start-column="33" selection-end-line="314" selection-end-column="33" />
|
1233
|
<folding>
|
1234
|
<folding>
|
1234
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
1235
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
1235
|
</folding>
|
1236
|
</folding>
|