郭盛 / scrap · 提交

转到一个项目

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

删除photo

内嵌 并排对比
正在显示 2 个修改的文件 包含 87 行增加 和 205 行删除
... ... @@ -2,7 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
<change type="DELETED" beforePath="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -25,37 +25,27 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ProjectController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="122" column="5" lean-forward="false" selection-start-line="122" selection-start-column="5" selection-end-line="122" selection-end-column="5" />
<state relative-caret-position="400">
<caret line="48" column="11" lean-forward="true" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" />
<folding>
<element signature="e#131#170#0#PHP" expanded="true" />
<element signature="e#275#1168#0#PHP" expanded="false" />
<element signature="e#1185#2077#0#PHP" expanded="false" />
<element signature="e#2098#3253#0#PHP" expanded="false" />
<element signature="e#3274#3743#0#PHP" expanded="false" />
<element signature="e#361#615#0#PHP" expanded="false" />
<element signature="e#632#1322#0#PHP" expanded="false" />
<element signature="e#1340#1586#0#PHP" expanded="false" />
<element signature="e#1604#2000#0#PHP" expanded="false" />
<element signature="e#2018#2406#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="14" column="32" lean-forward="false" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="888">
<caret line="90" column="7" lean-forward="false" selection-start-line="90" selection-start-column="7" selection-end-line="90" selection-end-column="7" />
<state relative-caret-position="200">
<caret line="47" column="37" lean-forward="true" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" />
<folding>
<element signature="e#1924#2026#0#PHP" expanded="false" />
<element signature="e#4937#4966#0#PHP" expanded="false" />
... ... @@ -69,42 +59,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="20" column="27" lean-forward="false" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
<folding>
<element signature="e#361#615#0#PHP" expanded="false" />
<element signature="e#632#1322#0#PHP" expanded="false" />
<element signature="e#1340#1586#0#PHP" expanded="false" />
<element signature="e#1604#2000#0#PHP" expanded="false" />
<element signature="e#2018#2406#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="photo.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="39" lean-forward="true" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="addlist.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="925">
<caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -189,8 +143,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="160" />
<option name="y" value="40" />
<option name="x" value="218" />
<option name="y" value="54" />
<option name="width" value="1678" />
<option name="height" value="1086" />
</component>
... ... @@ -243,15 +197,6 @@
<item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="shopgoods" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -322,18 +267,18 @@
<workItem from="1573448892997" duration="1343000" />
<workItem from="1573450754427" duration="9613000" />
<workItem from="1573463816109" duration="4867000" />
<workItem from="1573517804403" duration="4950000" />
<workItem from="1573517804403" duration="5906000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="188793000" />
<option name="totallyTimeSpent" value="189749000" />
</component>
<component name="ToolWindowManager">
<frame x="160" y="40" width="1678" height="1086" extended-state="1" />
<frame x="218" y="54" width="1678" height="1086" extended-state="1" />
<editor active="true" />
<layout>
<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" />
<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" />
<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" />
<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" />
<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 @@
<state relative-caret-position="375">
<caret line="73" column="5" lean-forward="true" selection-start-line="73" selection-start-column="5" selection-end-line="73" selection-end-column="5" />
<folding>
<element signature="e#131#170#0#PHP" expanded="true" />
<element signature="e#131#170#0#PHP" expanded="false" />
<element signature="e#262#867#0#PHP" expanded="false" />
<element signature="e#882#2069#0#PHP" expanded="false" />
<element signature="e#2084#3731#0#PHP" expanded="false" />
... ... @@ -453,7 +398,7 @@
<state relative-caret-position="370">
<caret line="25" column="32" lean-forward="true" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
<folding>
<element signature="e#131#170#0#PHP" expanded="true" />
<element signature="e#131#170#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -529,14 +474,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="925">
<caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
... ... @@ -558,28 +495,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="122" column="5" lean-forward="false" selection-start-line="122" selection-start-column="5" selection-end-line="122" selection-end-column="5" />
<folding>
<element signature="e#131#170#0#PHP" expanded="true" />
<element signature="e#275#1168#0#PHP" expanded="false" />
<element signature="e#1185#2077#0#PHP" expanded="false" />
<element signature="e#2098#3253#0#PHP" expanded="false" />
<element signature="e#3274#3743#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="14" column="32" lean-forward="false" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="738">
... ... @@ -731,39 +646,31 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<entry file="file://$PROJECT_DIR$/app/user/controller/FavoriteController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-212">
<state relative-caret-position="-187">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/FavoriteController.php">
<entry file="file://$PROJECT_DIR$/public/static/swiper3/swiper.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-187">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php">
<entry file="file://$PROJECT_DIR$/public/static/style/base.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="888">
<caret line="90" column="7" lean-forward="false" selection-start-line="90" selection-start-column="7" selection-end-line="90" selection-end-column="7" />
<folding>
<element signature="e#1924#2026#0#PHP" expanded="false" />
<element signature="e#4937#4966#0#PHP" expanded="false" />
<element signature="e#4971#5333#0#PHP" expanded="false" />
<element signature="e#5339#5375#0#PHP" expanded="false" />
<element signature="e#5380#5584#0#PHP" expanded="false" />
<element signature="e#5590#5612#0#PHP" expanded="false" />
<element signature="e#5617#5749#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="299">
<caret line="354" column="19" lean-forward="true" selection-start-line="354" selection-start-column="19" selection-end-line="354" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/static/swiper3/swiper.min.js">
<entry file="file://$USER_HOME$/Desktop/garbageCollect/Shoporder.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<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 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/static/style/base.css">
<entry file="file://$USER_HOME$/Desktop/garbageCollect/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="354" column="19" lean-forward="true" selection-start-line="354" selection-start-column="19" selection-end-line="354" selection-end-column="19" />
<state relative-caret-position="425">
<caret line="32" column="42" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="62" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="20" column="27" lean-forward="false" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
<state relative-caret-position="175">
<caret line="14" column="32" lean-forward="false" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="122" column="5" lean-forward="false" selection-start-line="122" selection-start-column="5" selection-end-line="122" selection-end-column="5" />
<folding>
<element signature="e#361#615#0#PHP" expanded="false" />
<element signature="e#632#1322#0#PHP" expanded="false" />
<element signature="e#1340#1586#0#PHP" expanded="false" />
<element signature="e#1604#2000#0#PHP" expanded="false" />
<element signature="e#2018#2406#0#PHP" expanded="false" />
<element signature="e#131#170#0#PHP" expanded="true" />
<element signature="e#275#1168#0#PHP" expanded="false" />
<element signature="e#1185#2077#0#PHP" expanded="false" />
<element signature="e#2098#3253#0#PHP" expanded="false" />
<element signature="e#3274#3743#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/garbageCollect/Shoporder.html">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="299">
<caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/garbageCollect/index.html">
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="32" column="42" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="62" selection-end-column="7" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="39" lean-forward="true" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />
<state relative-caret-position="-75">
<caret line="12" column="62" lean-forward="true" selection-start-line="12" selection-start-column="62" selection-end-line="12" selection-end-column="62" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="48" column="11" lean-forward="true" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" />
<folding>
<element signature="e#361#615#0#PHP" expanded="false" />
<element signature="e#632#1322#0#PHP" expanded="false" />
<element signature="e#1340#1586#0#PHP" expanded="false" />
<element signature="e#1604#2000#0#PHP" expanded="false" />
<element signature="e#2018#2406#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="47" column="37" lean-forward="true" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" />
<folding>
<element signature="e#1924#2026#0#PHP" expanded="false" />
<element signature="e#4937#4966#0#PHP" expanded="false" />
<element signature="e#4971#5333#0#PHP" expanded="false" />
<element signature="e#5339#5375#0#PHP" expanded="false" />
<element signature="e#5380#5584#0#PHP" expanded="false" />
<element signature="e#5590#5612#0#PHP" expanded="false" />
<element signature="e#5617#5749#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="maximum-scale=1.0, minimum-scale=1.0, user-scalable=0, initial-scale=1.0, width=device-width" />
<meta name="format-detection" content="telephone=no, email=no, date=no, address=no" />
<title>垃圾回收</title>
<meta name="description" content="" />
<meta name="keywords" content="" />
<link rel="stylesheet" href="__STATIC__/style/base.css">
<link rel="stylesheet" href="__STATIC__/style/common.css">
<link rel="stylesheet" href="__STATIC__/swiper3/swiper.min.css">
<script src="__STATIC__/js/base.js"></script>
<style>
.swiper-pagination-bullet-active {
opacity: 1;
background: rgba(255, 255, 255, 1);
}
</style>
</head>
<body>
<div class="index_swiper">
<div class="swiper-container swiper-container-horizontal">
<div class="swiper-wrapper">
<div class="swiper-slide">
<a href="">
<img src="__STATIC__/image/组 7298.png" alt="">
</a>
</div>
<div class="swiper-slide">
<a href="">
<img src="__STATIC__/image/组 7298.png" alt="">
</a>
</div>
<div class="swiper-slide">
<a href="">
<img src="__STATIC__/image/组 7298.png" alt="">
</a>
</div>
<div class="swiper-slide">
<a href="">
<img src="__STATIC__/image/组 7298.png" alt="">
</a>
</div>
</div>
<!-- Add Pagination -->
<div class="swiper-pagination swiper-pagination-clickable swiper-pagination-bullets"></div>
</div>
</div>
<script src="__STATIC__/js/jquery.js"></script>
<script src="__STATIC__/swiper3/swiper.min.js"></script>
<script>
var swiper = new Swiper('.swiper-container', {
pagination: '.swiper-pagination',
paginationClickable: true
});
</script>
</body>
</html>
\ No newline at end of file