郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 1c799c27693c89e9f8ba517309adba9187cfcd56 1 个父辈 5265b01b
1 个管道 的构建 通过 耗费 1 秒

商城轮播图

内嵌 并排对比
正在显示 2 个修改的文件 包含 142 行增加 和 81 行删除
@@ -2,48 +2,8 @@ @@ -2,48 +2,8 @@
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/static/image/1026035a34a8d37243b285b9d25cda58.png" />  
6 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/4246a0593e908faf3749431d8ccd0179.png" />  
7 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/JLYMBOT8EPCHF.png" />  
8 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/LOGO8.8-1_画板 1.png" />  
9 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/aec64c321cf9ade724f89cf847285170.png" />  
10 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/bg82.png" />  
11 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/fanhui.png" />  
12 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/righthui.png" />  
13 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_01.png" />  
14 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_02.png" />  
15 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_03.png" />  
16 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_04.png" />  
17 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_05.png" />  
18 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_06.png" />  
19 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_07.png" />  
20 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_08.png" />  
21 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_09.png" />  
22 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_33.png" />  
23 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_34.png" />  
24 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_35.png" />  
25 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_40.png" />  
26 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_41.png" />  
27 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_42.png" />  
28 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_43.png" />  
29 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_44.png" />  
30 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_46.png" />  
31 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_47.png" />  
32 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_48.png" />  
33 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_50.png" />  
34 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/世界环境日-05.png" />  
35 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/微信图片_20190925170523.png" />  
36 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/组 7297.png" />  
37 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/组 7298.png" />  
38 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/预览图_千图网_编号32389077.png" />  
39 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/js/base.js" />  
40 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/style/base.css" />  
41 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/style/common.css" />  
42 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/style/index.css" />  
43 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/swiper3/swiper.min.css" />  
44 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/swiper3/swiper.min.js" /> 5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
45 <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" />
46 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config.php" afterPath="$PROJECT_DIR$/app/config.php" />  
47 </list> 7 </list>
48 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
49 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -109,11 +69,27 @@ @@ -109,11 +69,27 @@
109 </provider> 69 </provider>
110 </entry> 70 </entry>
111 </file> 71 </file>
112 - <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true"> 72 + <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
113 <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php"> 73 <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
114 <provider selected="true" editor-type-id="text-editor"> 74 <provider selected="true" editor-type-id="text-editor">
115 - <state relative-caret-position="150">  
116 - <caret line="24" column="62" lean-forward="false" selection-start-line="24" selection-start-column="62" selection-end-line="24" selection-end-column="62" /> 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" />
117 <folding /> 93 <folding />
118 </state> 94 </state>
119 </provider> 95 </provider>
@@ -144,7 +120,6 @@ @@ -144,7 +120,6 @@
144 <component name="IdeDocumentHistory"> 120 <component name="IdeDocumentHistory">
145 <option name="CHANGED_PATHS"> 121 <option name="CHANGED_PATHS">
146 <list> 122 <list>
147 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/select.html" />  
148 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" /> 123 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
149 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" /> 124 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
150 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" /> 125 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
@@ -195,6 +170,7 @@ @@ -195,6 +170,7 @@
195 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" /> 170 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
196 <option value="$PROJECT_DIR$/app/config.php" /> 171 <option value="$PROJECT_DIR$/app/config.php" />
197 <option value="$PROJECT_DIR$/public/static/style/base.css" /> 172 <option value="$PROJECT_DIR$/public/static/style/base.css" />
  173 + <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
198 </list> 174 </list>
199 </option> 175 </option>
200 </component> 176 </component>
@@ -212,9 +188,9 @@ @@ -212,9 +188,9 @@
212 <sorting>DEFINITION_ORDER</sorting> 188 <sorting>DEFINITION_ORDER</sorting>
213 </component> 189 </component>
214 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 190 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
215 - <component name="ProjectFrameBounds">  
216 - <option name="x" value="485" />  
217 - <option name="y" value="47" /> 191 + <component name="ProjectFrameBounds" extendedState="1">
  192 + <option name="x" value="160" />
  193 + <option name="y" value="40" />
218 <option name="width" value="1678" /> 194 <option name="width" value="1678" />
219 <option name="height" value="1086" /> 195 <option name="height" value="1086" />
220 </component> 196 </component>
@@ -250,14 +226,31 @@ @@ -250,14 +226,31 @@
250 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 226 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
251 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 227 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
252 <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> 228 <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
253 - <item name="static" type="2a2b976b:PhpTreeStructureProvider$1" /> 229 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
254 </path> 230 </path>
255 <path> 231 <path>
256 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 232 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
257 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 233 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
258 <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> 234 <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
259 - <item name="static" type="2a2b976b:PhpTreeStructureProvider$1" />  
260 - <item name="style" type="2a2b976b:PhpTreeStructureProvider$1" /> 235 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  236 + <item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  237 + </path>
  238 + <path>
  239 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  240 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  241 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  242 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  243 + <item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  244 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
  245 + </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" />
261 </path> 254 </path>
262 </expand> 255 </expand>
263 <select /> 256 <select />
@@ -329,15 +322,15 @@ @@ -329,15 +322,15 @@
329 <workItem from="1573448892997" duration="1343000" /> 322 <workItem from="1573448892997" duration="1343000" />
330 <workItem from="1573450754427" duration="9613000" /> 323 <workItem from="1573450754427" duration="9613000" />
331 <workItem from="1573463816109" duration="4867000" /> 324 <workItem from="1573463816109" duration="4867000" />
332 - <workItem from="1573517804403" duration="4682000" /> 325 + <workItem from="1573517804403" duration="4950000" />
333 </task> 326 </task>
334 <servers /> 327 <servers />
335 </component> 328 </component>
336 <component name="TimeTrackingManager"> 329 <component name="TimeTrackingManager">
337 - <option name="totallyTimeSpent" value="188525000" /> 330 + <option name="totallyTimeSpent" value="188793000" />
338 </component> 331 </component>
339 <component name="ToolWindowManager"> 332 <component name="ToolWindowManager">
340 - <frame x="485" y="47" width="1678" height="1086" extended-state="0" /> 333 + <frame x="160" y="40" width="1678" height="1086" extended-state="1" />
341 <editor active="true" /> 334 <editor active="true" />
342 <layout> 335 <layout>
343 <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" /> 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" />
@@ -391,31 +384,6 @@ @@ -391,31 +384,6 @@
391 <watches-manager /> 384 <watches-manager />
392 </component> 385 </component>
393 <component name="editorHistoryManager"> 386 <component name="editorHistoryManager">
394 - <entry file="file://$PROJECT_DIR$/app/index/controller/DoorController.php">  
395 - <provider selected="true" editor-type-id="text-editor">  
396 - <state relative-caret-position="659">  
397 - <caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />  
398 - </state>  
399 - </provider>  
400 - </entry>  
401 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">  
402 - <provider selected="true" editor-type-id="text-editor">  
403 - <state relative-caret-position="456">  
404 - <caret line="92" column="15" lean-forward="true" selection-start-line="92" selection-start-column="15" selection-end-line="92" selection-end-column="15" />  
405 - <folding>  
406 - <element signature="e#266#1001#0#PHP" expanded="false" />  
407 - <element signature="e#3943#4413#0#PHP" expanded="false" />  
408 - </folding>  
409 - </state>  
410 - </provider>  
411 - </entry>  
412 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html">  
413 - <provider selected="true" editor-type-id="text-editor">  
414 - <state relative-caret-position="300">  
415 - <caret line="12" column="53" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="153" selection-end-column="0" />  
416 - </state>  
417 - </provider>  
418 - </entry>  
419 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/index.html"> 387 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/index.html">
420 <provider selected="true" editor-type-id="text-editor"> 388 <provider selected="true" editor-type-id="text-editor">
421 <state relative-caret-position="625"> 389 <state relative-caret-position="625">
@@ -813,8 +781,38 @@ @@ -813,8 +781,38 @@
813 </entry> 781 </entry>
814 <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php"> 782 <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
815 <provider selected="true" editor-type-id="text-editor"> 783 <provider selected="true" editor-type-id="text-editor">
816 - <state relative-caret-position="150">  
817 - <caret line="24" column="62" lean-forward="false" selection-start-line="24" selection-start-column="62" selection-end-line="24" selection-end-column="62" /> 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" />
  786 + <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" />
  792 + </folding>
  793 + </state>
  794 + </provider>
  795 + </entry>
  796 + <entry file="file://$USER_HOME$/Desktop/garbageCollect/Shoporder.html">
  797 + <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" />
  800 + <folding />
  801 + </state>
  802 + </provider>
  803 + </entry>
  804 + <entry file="file://$USER_HOME$/Desktop/garbageCollect/index.html">
  805 + <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" />
  808 + <folding />
  809 + </state>
  810 + </provider>
  811 + </entry>
  812 + <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html">
  813 + <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" />
818 <folding /> 816 <folding />
819 </state> 817 </state>
820 </provider> 818 </provider>
  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>