|
@@ -2,8 +2,8 @@ |
|
@@ -2,8 +2,8 @@ |
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/home/view/goods/audio_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" afterDir="false" />
|
5
|
<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" />
|
|
|
6
|
+ <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" 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" />
|
|
@@ -40,11 +40,11 @@ |
|
@@ -40,11 +40,11 @@ |
40
|
</provider>
|
40
|
</provider>
|
41
|
</entry>
|
41
|
</entry>
|
42
|
</file>
|
42
|
</file>
|
43
|
- <file leaf-file-name="advDetail.css" pinned="false" current-in-tab="false">
|
43
|
+ <file leaf-file-name="advDetail.css" pinned="false" current-in-tab="true">
|
44
|
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/advDetail.css">
|
44
|
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/advDetail.css">
|
45
|
<provider selected="true" editor-type-id="text-editor">
|
45
|
<provider selected="true" editor-type-id="text-editor">
|
46
|
- <state relative-caret-position="526">
|
|
|
47
|
- <caret line="431" column="21" selection-start-line="431" selection-start-column="13" selection-end-line="431" selection-end-column="21" />
|
46
|
+ <state relative-caret-position="764">
|
|
|
47
|
+ <caret line="445" column="1" selection-start-line="445" selection-start-column="1" selection-end-line="445" selection-end-column="1" />
|
48
|
</state>
|
48
|
</state>
|
49
|
</provider>
|
49
|
</provider>
|
50
|
</entry>
|
50
|
</entry>
|
|
@@ -86,11 +86,11 @@ |
|
@@ -86,11 +86,11 @@ |
86
|
</provider>
|
86
|
</provider>
|
87
|
</entry>
|
87
|
</entry>
|
88
|
</file>
|
88
|
</file>
|
89
|
- <file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="true">
|
89
|
+ <file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="false">
|
90
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
90
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
91
|
<provider selected="true" editor-type-id="text-editor">
|
91
|
<provider selected="true" editor-type-id="text-editor">
|
92
|
- <state relative-caret-position="571">
|
|
|
93
|
- <caret line="233" column="59" selection-start-line="233" selection-start-column="59" selection-end-line="233" selection-end-column="59" />
|
92
|
+ <state relative-caret-position="350">
|
|
|
93
|
+ <caret line="214" column="14" selection-start-line="214" selection-start-column="14" selection-end-line="214" selection-end-column="14" />
|
94
|
<folding>
|
94
|
<folding>
|
95
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
95
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
96
|
<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" />
|
96
|
<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" />
|
|
@@ -230,7 +230,6 @@ |
|
@@ -230,7 +230,6 @@ |
230
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
230
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
231
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
231
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
232
|
<option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />
|
232
|
<option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />
|
233
|
- <option value="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" />
|
|
|
234
|
<option value="$PROJECT_DIR$/application/database.php" />
|
233
|
<option value="$PROJECT_DIR$/application/database.php" />
|
235
|
<option value="$PROJECT_DIR$/application/home/view/public/js.html" />
|
234
|
<option value="$PROJECT_DIR$/application/home/view/public/js.html" />
|
236
|
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
|
235
|
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
|
|
@@ -238,6 +237,7 @@ |
|
@@ -238,6 +237,7 @@ |
238
|
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
237
|
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
239
|
<option value="$USER_HOME$/Desktop/userShopping/audioDetail.html" />
|
238
|
<option value="$USER_HOME$/Desktop/userShopping/audioDetail.html" />
|
240
|
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
|
239
|
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
|
|
|
240
|
+ <option value="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" />
|
241
|
</list>
|
241
|
</list>
|
242
|
</option>
|
242
|
</option>
|
243
|
</component>
|
243
|
</component>
|
|
@@ -467,14 +467,7 @@ |
|
@@ -467,14 +467,7 @@ |
467
|
<workItem from="1572568391799" duration="24440000" />
|
467
|
<workItem from="1572568391799" duration="24440000" />
|
468
|
<workItem from="1572668245063" duration="699000" />
|
468
|
<workItem from="1572668245063" duration="699000" />
|
469
|
<workItem from="1572827640492" duration="25475000" />
|
469
|
<workItem from="1572827640492" duration="25475000" />
|
470
|
- <workItem from="1572914713443" duration="16268000" />
|
|
|
471
|
- </task>
|
|
|
472
|
- <task id="LOCAL-00141" summary="视频详情">
|
|
|
473
|
- <created>1572922128656</created>
|
|
|
474
|
- <option name="number" value="00141" />
|
|
|
475
|
- <option name="presentableId" value="LOCAL-00141" />
|
|
|
476
|
- <option name="project" value="LOCAL" />
|
|
|
477
|
- <updated>1572922128656</updated>
|
470
|
+ <workItem from="1572914713443" duration="17607000" />
|
478
|
</task>
|
471
|
</task>
|
479
|
<task id="LOCAL-00142" summary="视频详情">
|
472
|
<task id="LOCAL-00142" summary="视频详情">
|
480
|
<created>1572922215490</created>
|
473
|
<created>1572922215490</created>
|
|
@@ -812,11 +805,18 @@ |
|
@@ -812,11 +805,18 @@ |
812
|
<option name="project" value="LOCAL" />
|
805
|
<option name="project" value="LOCAL" />
|
813
|
<updated>1572935403850</updated>
|
806
|
<updated>1572935403850</updated>
|
814
|
</task>
|
807
|
</task>
|
815
|
- <option name="localTasksCounter" value="190" />
|
808
|
+ <task id="LOCAL-00190" summary="音频">
|
|
|
809
|
+ <created>1572935953422</created>
|
|
|
810
|
+ <option name="number" value="00190" />
|
|
|
811
|
+ <option name="presentableId" value="LOCAL-00190" />
|
|
|
812
|
+ <option name="project" value="LOCAL" />
|
|
|
813
|
+ <updated>1572935953422</updated>
|
|
|
814
|
+ </task>
|
|
|
815
|
+ <option name="localTasksCounter" value="191" />
|
816
|
<servers />
|
816
|
<servers />
|
817
|
</component>
|
817
|
</component>
|
818
|
<component name="TimeTrackingManager">
|
818
|
<component name="TimeTrackingManager">
|
819
|
- <option name="totallyTimeSpent" value="315846000" />
|
819
|
+ <option name="totallyTimeSpent" value="317185000" />
|
820
|
</component>
|
820
|
</component>
|
821
|
<component name="ToolWindowManager">
|
821
|
<component name="ToolWindowManager">
|
822
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
822
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -1223,13 +1223,6 @@ |
|
@@ -1223,13 +1223,6 @@ |
1223
|
</state>
|
1223
|
</state>
|
1224
|
</provider>
|
1224
|
</provider>
|
1225
|
</entry>
|
1225
|
</entry>
|
1226
|
- <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/advDetail.css">
|
|
|
1227
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
1228
|
- <state relative-caret-position="526">
|
|
|
1229
|
- <caret line="431" column="21" selection-start-line="431" selection-start-column="13" selection-end-line="431" selection-end-column="21" />
|
|
|
1230
|
- </state>
|
|
|
1231
|
- </provider>
|
|
|
1232
|
- </entry>
|
|
|
1233
|
<entry file="file://$USER_HOME$/Desktop/userShopping/audioDetail.html">
|
1226
|
<entry file="file://$USER_HOME$/Desktop/userShopping/audioDetail.html">
|
1234
|
<provider selected="true" editor-type-id="text-editor">
|
1227
|
<provider selected="true" editor-type-id="text-editor">
|
1235
|
<state relative-caret-position="31">
|
1228
|
<state relative-caret-position="31">
|
|
@@ -1239,8 +1232,8 @@ |
|
@@ -1239,8 +1232,8 @@ |
1239
|
</entry>
|
1232
|
</entry>
|
1240
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
1233
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
|
1241
|
<provider selected="true" editor-type-id="text-editor">
|
1234
|
<provider selected="true" editor-type-id="text-editor">
|
1242
|
- <state relative-caret-position="571">
|
|
|
1243
|
- <caret line="233" column="59" selection-start-line="233" selection-start-column="59" selection-end-line="233" selection-end-column="59" />
|
1235
|
+ <state relative-caret-position="350">
|
|
|
1236
|
+ <caret line="214" column="14" selection-start-line="214" selection-start-column="14" selection-end-line="214" selection-end-column="14" />
|
1244
|
<folding>
|
1237
|
<folding>
|
1245
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
1238
|
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
1246
|
<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" />
|
1239
|
<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" />
|
|
@@ -1248,6 +1241,13 @@ |
|
@@ -1248,6 +1241,13 @@ |
1248
|
</state>
|
1241
|
</state>
|
1249
|
</provider>
|
1242
|
</provider>
|
1250
|
</entry>
|
1243
|
</entry>
|
|
|
1244
|
+ <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/advDetail.css">
|
|
|
1245
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1246
|
+ <state relative-caret-position="764">
|
|
|
1247
|
+ <caret line="445" column="1" selection-start-line="445" selection-start-column="1" selection-end-line="445" selection-end-column="1" />
|
|
|
1248
|
+ </state>
|
|
|
1249
|
+ </provider>
|
|
|
1250
|
+ </entry>
|
1251
|
</component>
|
1251
|
</component>
|
1252
|
<component name="masterDetails">
|
1252
|
<component name="masterDetails">
|
1253
|
<states>
|
1253
|
<states>
|