郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 f47e2c8174123c117ca03984ffa562a320b028c9 1 个父辈 1c799c27
1 个管道 的构建 通过 耗费 3 秒

删除photo

内嵌 并排对比
正在显示 2 个修改的文件 包含 87 行增加 和 205 行删除
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
5 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" /> 5 + <change type="DELETED" beforePath="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" afterPath="" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
7 </list> 7 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -25,37 +25,27 @@ @@ -25,37 +25,27 @@
25 </component> 25 </component>
26 <component name="FileEditorManager"> 26 <component name="FileEditorManager">
27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 - <file leaf-file-name="ProjectController.php" pinned="false" current-in-tab="false">  
29 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php"> 28 + <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
30 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="550">  
32 - <caret line="122" column="5" lean-forward="false" selection-start-line="122" selection-start-column="5" selection-end-line="122" selection-end-column="5" /> 31 + <state relative-caret-position="400">
  32 + <caret line="48" column="11" lean-forward="true" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" />
33 <folding> 33 <folding>
34 - <element signature="e#131#170#0#PHP" expanded="true" />  
35 - <element signature="e#275#1168#0#PHP" expanded="false" />  
36 - <element signature="e#1185#2077#0#PHP" expanded="false" />  
37 - <element signature="e#2098#3253#0#PHP" expanded="false" />  
38 - <element signature="e#3274#3743#0#PHP" expanded="false" /> 34 + <element signature="e#361#615#0#PHP" expanded="false" />
  35 + <element signature="e#632#1322#0#PHP" expanded="false" />
  36 + <element signature="e#1340#1586#0#PHP" expanded="false" />
  37 + <element signature="e#1604#2000#0#PHP" expanded="false" />
  38 + <element signature="e#2018#2406#0#PHP" expanded="false" />
39 </folding> 39 </folding>
40 </state> 40 </state>
41 </provider> 41 </provider>
42 </entry> 42 </entry>
43 </file> 43 </file>
44 - <file leaf-file-name="detail.html" pinned="false" current-in-tab="false">  
45 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">  
46 - <provider selected="true" editor-type-id="text-editor">  
47 - <state relative-caret-position="250">  
48 - <caret line="14" column="32" lean-forward="false" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />  
49 - <folding />  
50 - </state>  
51 - </provider>  
52 - </entry>  
53 - </file>  
54 - <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false"> 44 + <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="true">
55 <entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php"> 45 <entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php">
56 <provider selected="true" editor-type-id="text-editor"> 46 <provider selected="true" editor-type-id="text-editor">
57 - <state relative-caret-position="888">  
58 - <caret line="90" column="7" lean-forward="false" selection-start-line="90" selection-start-column="7" selection-end-line="90" selection-end-column="7" /> 47 + <state relative-caret-position="200">
  48 + <caret line="47" column="37" lean-forward="true" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" />
59 <folding> 49 <folding>
60 <element signature="e#1924#2026#0#PHP" expanded="false" /> 50 <element signature="e#1924#2026#0#PHP" expanded="false" />
61 <element signature="e#4937#4966#0#PHP" expanded="false" /> 51 <element signature="e#4937#4966#0#PHP" expanded="false" />
@@ -69,42 +59,6 @@ @@ -69,42 +59,6 @@
69 </provider> 59 </provider>
70 </entry> 60 </entry>
71 </file> 61 </file>
72 - <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">  
73 - <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">  
74 - <provider selected="true" editor-type-id="text-editor">  
75 - <state relative-caret-position="275">  
76 - <caret line="20" column="27" lean-forward="false" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />  
77 - <folding>  
78 - <element signature="e#361#615#0#PHP" expanded="false" />  
79 - <element signature="e#632#1322#0#PHP" expanded="false" />  
80 - <element signature="e#1340#1586#0#PHP" expanded="false" />  
81 - <element signature="e#1604#2000#0#PHP" expanded="false" />  
82 - <element signature="e#2018#2406#0#PHP" expanded="false" />  
83 - </folding>  
84 - </state>  
85 - </provider>  
86 - </entry>  
87 - </file>  
88 - <file leaf-file-name="photo.html" pinned="false" current-in-tab="true">  
89 - <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html">  
90 - <provider selected="true" editor-type-id="text-editor">  
91 - <state relative-caret-position="250">  
92 - <caret line="10" column="39" lean-forward="true" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />  
93 - <folding />  
94 - </state>  
95 - </provider>  
96 - </entry>  
97 - </file>  
98 - <file leaf-file-name="addlist.html" pinned="false" current-in-tab="false">  
99 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">  
100 - <provider selected="true" editor-type-id="text-editor">  
101 - <state relative-caret-position="925">  
102 - <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />  
103 - <folding />  
104 - </state>  
105 - </provider>  
106 - </entry>  
107 - </file>  
108 </leaf> 62 </leaf>
109 </component> 63 </component>
110 <component name="FileTemplateManagerImpl"> 64 <component name="FileTemplateManagerImpl">
@@ -189,8 +143,8 @@ @@ -189,8 +143,8 @@
189 </component> 143 </component>
190 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 144 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
191 <component name="ProjectFrameBounds" extendedState="1"> 145 <component name="ProjectFrameBounds" extendedState="1">
192 - <option name="x" value="160" />  
193 - <option name="y" value="40" /> 146 + <option name="x" value="218" />
  147 + <option name="y" value="54" />
194 <option name="width" value="1678" /> 148 <option name="width" value="1678" />
195 <option name="height" value="1086" /> 149 <option name="height" value="1086" />
196 </component> 150 </component>
@@ -243,15 +197,6 @@ @@ -243,15 +197,6 @@
243 <item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" /> 197 <item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
244 <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 198 <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
245 </path> 199 </path>
246 - <path>  
247 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
248 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
249 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
250 - <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />  
251 - <item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />  
252 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />  
253 - <item name="shopgoods" type="2a2b976b:PhpTreeStructureProvider$1" />  
254 - </path>  
255 </expand> 200 </expand>
256 <select /> 201 <select />
257 </subPane> 202 </subPane>
@@ -322,18 +267,18 @@ @@ -322,18 +267,18 @@
322 <workItem from="1573448892997" duration="1343000" /> 267 <workItem from="1573448892997" duration="1343000" />
323 <workItem from="1573450754427" duration="9613000" /> 268 <workItem from="1573450754427" duration="9613000" />
324 <workItem from="1573463816109" duration="4867000" /> 269 <workItem from="1573463816109" duration="4867000" />
325 - <workItem from="1573517804403" duration="4950000" /> 270 + <workItem from="1573517804403" duration="5906000" />
326 </task> 271 </task>
327 <servers /> 272 <servers />
328 </component> 273 </component>
329 <component name="TimeTrackingManager"> 274 <component name="TimeTrackingManager">
330 - <option name="totallyTimeSpent" value="188793000" /> 275 + <option name="totallyTimeSpent" value="189749000" />
331 </component> 276 </component>
332 <component name="ToolWindowManager"> 277 <component name="ToolWindowManager">
333 - <frame x="160" y="40" width="1678" height="1086" extended-state="1" /> 278 + <frame x="218" y="54" width="1678" height="1086" extended-state="1" />
334 <editor active="true" /> 279 <editor active="true" />
335 <layout> 280 <layout>
336 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17428924" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 281 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19592088" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
337 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 282 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
338 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> 283 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
339 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 284 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -410,7 +355,7 @@ @@ -410,7 +355,7 @@
410 <state relative-caret-position="375"> 355 <state relative-caret-position="375">
411 <caret line="73" column="5" lean-forward="true" selection-start-line="73" selection-start-column="5" selection-end-line="73" selection-end-column="5" /> 356 <caret line="73" column="5" lean-forward="true" selection-start-line="73" selection-start-column="5" selection-end-line="73" selection-end-column="5" />
412 <folding> 357 <folding>
413 - <element signature="e#131#170#0#PHP" expanded="true" /> 358 + <element signature="e#131#170#0#PHP" expanded="false" />
414 <element signature="e#262#867#0#PHP" expanded="false" /> 359 <element signature="e#262#867#0#PHP" expanded="false" />
415 <element signature="e#882#2069#0#PHP" expanded="false" /> 360 <element signature="e#882#2069#0#PHP" expanded="false" />
416 <element signature="e#2084#3731#0#PHP" expanded="false" /> 361 <element signature="e#2084#3731#0#PHP" expanded="false" />
@@ -453,7 +398,7 @@ @@ -453,7 +398,7 @@
453 <state relative-caret-position="370"> 398 <state relative-caret-position="370">
454 <caret line="25" column="32" lean-forward="true" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" /> 399 <caret line="25" column="32" lean-forward="true" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
455 <folding> 400 <folding>
456 - <element signature="e#131#170#0#PHP" expanded="true" /> 401 + <element signature="e#131#170#0#PHP" expanded="false" />
457 </folding> 402 </folding>
458 </state> 403 </state>
459 </provider> 404 </provider>
@@ -529,14 +474,6 @@ @@ -529,14 +474,6 @@
529 </state> 474 </state>
530 </provider> 475 </provider>
531 </entry> 476 </entry>
532 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">  
533 - <provider selected="true" editor-type-id="text-editor">  
534 - <state relative-caret-position="925">  
535 - <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />  
536 - <folding />  
537 - </state>  
538 - </provider>  
539 - </entry>  
540 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html"> 477 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html">
541 <provider selected="true" editor-type-id="text-editor"> 478 <provider selected="true" editor-type-id="text-editor">
542 <state relative-caret-position="275"> 479 <state relative-caret-position="275">
@@ -558,28 +495,6 @@ @@ -558,28 +495,6 @@
558 </state> 495 </state>
559 </provider> 496 </provider>
560 </entry> 497 </entry>
561 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">  
562 - <provider selected="true" editor-type-id="text-editor">  
563 - <state relative-caret-position="550">  
564 - <caret line="122" column="5" lean-forward="false" selection-start-line="122" selection-start-column="5" selection-end-line="122" selection-end-column="5" />  
565 - <folding>  
566 - <element signature="e#131#170#0#PHP" expanded="true" />  
567 - <element signature="e#275#1168#0#PHP" expanded="false" />  
568 - <element signature="e#1185#2077#0#PHP" expanded="false" />  
569 - <element signature="e#2098#3253#0#PHP" expanded="false" />  
570 - <element signature="e#3274#3743#0#PHP" expanded="false" />  
571 - </folding>  
572 - </state>  
573 - </provider>  
574 - </entry>  
575 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">  
576 - <provider selected="true" editor-type-id="text-editor">  
577 - <state relative-caret-position="250">  
578 - <caret line="14" column="32" lean-forward="false" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />  
579 - <folding />  
580 - </state>  
581 - </provider>  
582 - </entry>  
583 <entry file="file://$PROJECT_DIR$/app/config.php"> 498 <entry file="file://$PROJECT_DIR$/app/config.php">
584 <provider selected="true" editor-type-id="text-editor"> 499 <provider selected="true" editor-type-id="text-editor">
585 <state relative-caret-position="738"> 500 <state relative-caret-position="738">
@@ -731,39 +646,31 @@ @@ -731,39 +646,31 @@
731 </state> 646 </state>
732 </provider> 647 </provider>
733 </entry> 648 </entry>
734 - <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php"> 649 + <entry file="file://$PROJECT_DIR$/app/user/controller/FavoriteController.php">
735 <provider selected="true" editor-type-id="text-editor"> 650 <provider selected="true" editor-type-id="text-editor">
736 - <state relative-caret-position="-212"> 651 + <state relative-caret-position="-187">
737 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 652 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
738 <folding /> 653 <folding />
739 </state> 654 </state>
740 </provider> 655 </provider>
741 </entry> 656 </entry>
742 - <entry file="file://$PROJECT_DIR$/app/user/controller/FavoriteController.php"> 657 + <entry file="file://$PROJECT_DIR$/public/static/swiper3/swiper.min.js">
743 <provider selected="true" editor-type-id="text-editor"> 658 <provider selected="true" editor-type-id="text-editor">
744 - <state relative-caret-position="-187"> 659 + <state relative-caret-position="0">
745 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 660 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
746 <folding /> 661 <folding />
747 </state> 662 </state>
748 </provider> 663 </provider>
749 </entry> 664 </entry>
750 - <entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php"> 665 + <entry file="file://$PROJECT_DIR$/public/static/style/base.css">
751 <provider selected="true" editor-type-id="text-editor"> 666 <provider selected="true" editor-type-id="text-editor">
752 - <state relative-caret-position="888">  
753 - <caret line="90" column="7" lean-forward="false" selection-start-line="90" selection-start-column="7" selection-end-line="90" selection-end-column="7" />  
754 - <folding>  
755 - <element signature="e#1924#2026#0#PHP" expanded="false" />  
756 - <element signature="e#4937#4966#0#PHP" expanded="false" />  
757 - <element signature="e#4971#5333#0#PHP" expanded="false" />  
758 - <element signature="e#5339#5375#0#PHP" expanded="false" />  
759 - <element signature="e#5380#5584#0#PHP" expanded="false" />  
760 - <element signature="e#5590#5612#0#PHP" expanded="false" />  
761 - <element signature="e#5617#5749#0#PHP" expanded="false" />  
762 - </folding> 667 + <state relative-caret-position="299">
  668 + <caret line="354" column="19" lean-forward="true" selection-start-line="354" selection-start-column="19" selection-end-line="354" selection-end-column="19" />
  669 + <folding />
763 </state> 670 </state>
764 </provider> 671 </provider>
765 </entry> 672 </entry>
766 - <entry file="file://$PROJECT_DIR$/public/static/swiper3/swiper.min.js"> 673 + <entry file="file://$USER_HOME$/Desktop/garbageCollect/Shoporder.html">
767 <provider selected="true" editor-type-id="text-editor"> 674 <provider selected="true" editor-type-id="text-editor">
768 <state relative-caret-position="0"> 675 <state relative-caret-position="0">
769 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 676 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -771,51 +678,89 @@ @@ -771,51 +678,89 @@
771 </state> 678 </state>
772 </provider> 679 </provider>
773 </entry> 680 </entry>
774 - <entry file="file://$PROJECT_DIR$/public/static/style/base.css"> 681 + <entry file="file://$USER_HOME$/Desktop/garbageCollect/index.html">
775 <provider selected="true" editor-type-id="text-editor"> 682 <provider selected="true" editor-type-id="text-editor">
776 - <state relative-caret-position="299">  
777 - <caret line="354" column="19" lean-forward="true" selection-start-line="354" selection-start-column="19" selection-end-line="354" selection-end-column="19" /> 683 + <state relative-caret-position="425">
  684 + <caret line="32" column="42" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="62" selection-end-column="7" />
778 <folding /> 685 <folding />
779 </state> 686 </state>
780 </provider> 687 </provider>
781 </entry> 688 </entry>
782 - <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php"> 689 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">
783 <provider selected="true" editor-type-id="text-editor"> 690 <provider selected="true" editor-type-id="text-editor">
784 - <state relative-caret-position="275">  
785 - <caret line="20" column="27" lean-forward="false" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" /> 691 + <state relative-caret-position="175">
  692 + <caret line="14" column="32" lean-forward="false" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
  693 + <folding />
  694 + </state>
  695 + </provider>
  696 + </entry>
  697 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
  698 + <provider selected="true" editor-type-id="text-editor">
  699 + <state relative-caret-position="550">
  700 + <caret line="122" column="5" lean-forward="false" selection-start-line="122" selection-start-column="5" selection-end-line="122" selection-end-column="5" />
786 <folding> 701 <folding>
787 - <element signature="e#361#615#0#PHP" expanded="false" />  
788 - <element signature="e#632#1322#0#PHP" expanded="false" />  
789 - <element signature="e#1340#1586#0#PHP" expanded="false" />  
790 - <element signature="e#1604#2000#0#PHP" expanded="false" />  
791 - <element signature="e#2018#2406#0#PHP" expanded="false" /> 702 + <element signature="e#131#170#0#PHP" expanded="true" />
  703 + <element signature="e#275#1168#0#PHP" expanded="false" />
  704 + <element signature="e#1185#2077#0#PHP" expanded="false" />
  705 + <element signature="e#2098#3253#0#PHP" expanded="false" />
  706 + <element signature="e#3274#3743#0#PHP" expanded="false" />
792 </folding> 707 </folding>
793 </state> 708 </state>
794 </provider> 709 </provider>
795 </entry> 710 </entry>
796 - <entry file="file://$USER_HOME$/Desktop/garbageCollect/Shoporder.html"> 711 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">
797 <provider selected="true" editor-type-id="text-editor"> 712 <provider selected="true" editor-type-id="text-editor">
798 - <state relative-caret-position="0">  
799 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 713 + <state relative-caret-position="299">
  714 + <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
800 <folding /> 715 <folding />
801 </state> 716 </state>
802 </provider> 717 </provider>
803 </entry> 718 </entry>
804 - <entry file="file://$USER_HOME$/Desktop/garbageCollect/index.html"> 719 + <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
805 <provider selected="true" editor-type-id="text-editor"> 720 <provider selected="true" editor-type-id="text-editor">
806 - <state relative-caret-position="425">  
807 - <caret line="32" column="42" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="62" selection-end-column="7" /> 721 + <state relative-caret-position="0">
  722 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
808 <folding /> 723 <folding />
809 </state> 724 </state>
810 </provider> 725 </provider>
811 </entry> 726 </entry>
812 <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html"> 727 <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html">
813 <provider selected="true" editor-type-id="text-editor"> 728 <provider selected="true" editor-type-id="text-editor">
814 - <state relative-caret-position="250">  
815 - <caret line="10" column="39" lean-forward="true" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" /> 729 + <state relative-caret-position="-75">
  730 + <caret line="12" column="62" lean-forward="true" selection-start-line="12" selection-start-column="62" selection-end-line="12" selection-end-column="62" />
816 <folding /> 731 <folding />
817 </state> 732 </state>
818 </provider> 733 </provider>
819 </entry> 734 </entry>
  735 + <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
  736 + <provider selected="true" editor-type-id="text-editor">
  737 + <state relative-caret-position="400">
  738 + <caret line="48" column="11" lean-forward="true" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" />
  739 + <folding>
  740 + <element signature="e#361#615#0#PHP" expanded="false" />
  741 + <element signature="e#632#1322#0#PHP" expanded="false" />
  742 + <element signature="e#1340#1586#0#PHP" expanded="false" />
  743 + <element signature="e#1604#2000#0#PHP" expanded="false" />
  744 + <element signature="e#2018#2406#0#PHP" expanded="false" />
  745 + </folding>
  746 + </state>
  747 + </provider>
  748 + </entry>
  749 + <entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php">
  750 + <provider selected="true" editor-type-id="text-editor">
  751 + <state relative-caret-position="200">
  752 + <caret line="47" column="37" lean-forward="true" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" />
  753 + <folding>
  754 + <element signature="e#1924#2026#0#PHP" expanded="false" />
  755 + <element signature="e#4937#4966#0#PHP" expanded="false" />
  756 + <element signature="e#4971#5333#0#PHP" expanded="false" />
  757 + <element signature="e#5339#5375#0#PHP" expanded="false" />
  758 + <element signature="e#5380#5584#0#PHP" expanded="false" />
  759 + <element signature="e#5590#5612#0#PHP" expanded="false" />
  760 + <element signature="e#5617#5749#0#PHP" expanded="false" />
  761 + </folding>
  762 + </state>
  763 + </provider>
  764 + </entry>
820 </component> 765 </component>
821 </project> 766 </project>
1 -<!DOCTYPE html>  
2 -<html>  
3 -  
4 -<head>  
5 - <meta charset="utf-8" />  
6 - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />  
7 - <meta name="viewport" content="maximum-scale=1.0, minimum-scale=1.0, user-scalable=0, initial-scale=1.0, width=device-width" />  
8 - <meta name="format-detection" content="telephone=no, email=no, date=no, address=no" />  
9 - <title>垃圾回收</title>  
10 - <meta name="description" content="" />  
11 - <meta name="keywords" content="" />  
12 - <link rel="stylesheet" href="__STATIC__/style/base.css">  
13 - <link rel="stylesheet" href="__STATIC__/style/common.css">  
14 - <link rel="stylesheet" href="__STATIC__/swiper3/swiper.min.css">  
15 - <script src="__STATIC__/js/base.js"></script>  
16 - <style>  
17 - .swiper-pagination-bullet-active {  
18 - opacity: 1;  
19 - background: rgba(255, 255, 255, 1);  
20 - }  
21 - </style>  
22 -</head>  
23 -  
24 -<body>  
25 -<div class="index_swiper">  
26 - <div class="swiper-container swiper-container-horizontal">  
27 - <div class="swiper-wrapper">  
28 - <div class="swiper-slide">  
29 - <a href="">  
30 - <img src="__STATIC__/image/组 7298.png" alt="">  
31 - </a>  
32 - </div>  
33 - <div class="swiper-slide">  
34 - <a href="">  
35 - <img src="__STATIC__/image/组 7298.png" alt="">  
36 - </a>  
37 - </div>  
38 - <div class="swiper-slide">  
39 - <a href="">  
40 - <img src="__STATIC__/image/组 7298.png" alt="">  
41 - </a>  
42 - </div>  
43 - <div class="swiper-slide">  
44 - <a href="">  
45 - <img src="__STATIC__/image/组 7298.png" alt="">  
46 - </a>  
47 - </div>  
48 - </div>  
49 - <!-- Add Pagination -->  
50 - <div class="swiper-pagination swiper-pagination-clickable swiper-pagination-bullets"></div>  
51 - </div>  
52 -</div>  
53 -<script src="__STATIC__/js/jquery.js"></script>  
54 -<script src="__STATIC__/swiper3/swiper.min.js"></script>  
55 -<script>  
56 - var swiper = new Swiper('.swiper-container', {  
57 - pagination: '.swiper-pagination',  
58 - paginationClickable: true  
59 - });  
60 -</script>  
61 -</body>  
62 -  
63 -</html>