第二次提交
6
.idea/vcs.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
555
.idea/workspace.xml
generated
@@ -1,10 +1,46 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="BookmarkManager">
|
||||
<bookmark url="file://$PROJECT_DIR$/template/pc/rainbow/index/index.html" line="49" />
|
||||
<bookmark url="file://$PROJECT_DIR$/template/pc/rainbow/index/index.html" line="158" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="4bc89476-3ad2-4028-ab7f-8bbdfce6a0f0" name="Default Changelist" comment="" />
|
||||
<list default="true" id="4bc89476-3ad2-4028-ab7f-8bbdfce6a0f0" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/template/mobile/rainbow/goods/Listgoods.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/application/admin/view/comment/ajax_ask_list.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/comment/ajax_ask_list.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/application/admin/view/comment/ask_list.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/comment/ask_list.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/application/home/controller/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Article.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/application/home/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/upload/goods/thumb/1/goods_sub_thumb_1_236_236.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/upload/goods/thumb/1/goods_sub_thumb_1_400_400.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/upload/goods/thumb/1/goods_sub_thumb_1_60_60.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/upload/goods/thumb/1/goods_sub_thumb_1_800_800.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/upload/goods/thumb/1/goods_thumb_1_0_160_160.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/upload/goods/thumb/1/goods_thumb_1_0_180_180.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/upload/goods/thumb/1/goods_thumb_1_0_200_200.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/upload/goods/thumb/1/goods_thumb_1_0_236_236.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/upload/goods/thumb/1/goods_thumb_1_0_400_400.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/upload/goods/thumb/1/goods_thumb_1_0_800_800.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/runtime/cache/2775a0b6acc2ed6e6929f76d12caf1ab/29/87299ed82abe41e34ad72ad2252d69.php" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/runtime/cache/2775a0b6acc2ed6e6929f76d12caf1ab/7f/43685433cb7b053fc25679cc4a473e.php" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/runtime/cache/2775a0b6acc2ed6e6929f76d12caf1ab/8e/287457582475174c4ce6b1ef7daa34.php" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/runtime/cache/2775a0b6acc2ed6e6929f76d12caf1ab/aa/54d5a0f00143a7d4deda7bcc8b5437.php" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/runtime/cache/2775a0b6acc2ed6e6929f76d12caf1ab/b3/aa26c3e083dd4303eb87f6f626dc4e.php" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/runtime/cache/2775a0b6acc2ed6e6929f76d12caf1ab/d4/b0cfa16c008423bcb805cac827dc85.php" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/runtime/cache/2775a0b6acc2ed6e6929f76d12caf1ab/f2/481f823f955f04ea0c1c6d8c2e0189.php" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/runtime/temp/a5e210a649a5e95e997b060b5952c7de.php" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/template/pc/rainbow/goods/goodsInfo.html" beforeDir="false" afterPath="$PROJECT_DIR$/template/pc/rainbow/goods/goodsInfo.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/template/pc/rainbow/goods/search.html" beforeDir="false" afterPath="$PROJECT_DIR$/template/pc/rainbow/goods/search.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/template/pc/rainbow/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/template/pc/rainbow/index/index.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/template/pc/rainbow/index/index1111.html" beforeDir="false" afterPath="$PROJECT_DIR$/template/pc/rainbow/index/index1111.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/template/pc/rainbow/public/header.html" beforeDir="false" afterPath="$PROJECT_DIR$/template/pc/rainbow/public/header.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/template/pc/rainbow/static/css/base.css" beforeDir="false" afterPath="$PROJECT_DIR$/template/pc/rainbow/static/css/base.css" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/template/pc/rainbow/static/css/myaccount.css" beforeDir="false" afterPath="$PROJECT_DIR$/template/pc/rainbow/static/css/myaccount.css" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/template/pc/rainbow/user/header.html" beforeDir="false" afterPath="$PROJECT_DIR$/template/pc/rainbow/user/header.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/template/pc/rainbow/user/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/template/pc/rainbow/user/login.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/template/pc/rainbow/user/reg.html" beforeDir="false" afterPath="$PROJECT_DIR$/template/pc/rainbow/user/reg.html" afterDir="false" />
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@@ -54,90 +90,70 @@
|
||||
</counts>
|
||||
</usages-collector>
|
||||
</session>
|
||||
<session id="1430942835">
|
||||
<usages-collector id="statistics.lifecycle.project">
|
||||
<counts>
|
||||
<entry key="project.open.time.1" value="1" />
|
||||
<entry key="project.opened" value="1" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.extensions.edit">
|
||||
<counts>
|
||||
<entry key="html" value="169" />
|
||||
<entry key="php" value="57" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.types.edit">
|
||||
<counts>
|
||||
<entry key="HTML" value="169" />
|
||||
<entry key="PHP" value="57" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.extensions.open">
|
||||
<counts>
|
||||
<entry key="css" value="1" />
|
||||
<entry key="html" value="17" />
|
||||
<entry key="php" value="11" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.types.open">
|
||||
<counts>
|
||||
<entry key="CSS" value="1" />
|
||||
<entry key="HTML" value="17" />
|
||||
<entry key="PHP" value="11" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
</session>
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/index/index1111.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="209">
|
||||
<caret line="132" column="34" lean-forward="true" selection-start-line="132" selection-start-column="34" selection-end-line="132" selection-end-column="34" />
|
||||
<folding>
|
||||
<element signature="n#script#0;n#div#0;n#body#0;n#html#0;n#!!top" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/static/css/tpshop.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="311">
|
||||
<caret line="1713" column="35" selection-start-line="1713" selection-start-column="35" selection-end-line="1713" selection-end-column="35" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="261">
|
||||
<caret line="277" column="63" selection-start-line="277" selection-start-column="56" selection-end-line="277" selection-end-column="63" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/goods/goodsList.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="413">
|
||||
<caret line="116" column="45" selection-start-line="112" selection-start-column="40" selection-end-line="116" selection-end-column="45" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="437">
|
||||
<caret line="51" column="51" selection-start-line="51" selection-start-column="51" selection-end-line="51" selection-end-column="51" />
|
||||
<folding>
|
||||
<element signature="e#545#560#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/application/database.php_read">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-225" />
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/application/database.php">
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/article/listdd.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="380">
|
||||
<caret line="28" column="20" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
|
||||
<caret line="56" column="78" selection-start-line="56" selection-start-column="78" selection-end-line="56" selection-end-column="78" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/application/home/common.php">
|
||||
<entry file="file://$PROJECT_DIR$/application/home/controller/Article.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="359">
|
||||
<caret line="35" column="1" selection-start-line="35" selection-start-column="1" selection-end-line="35" selection-end-column="1" />
|
||||
<state relative-caret-position="283">
|
||||
<caret line="49" column="46" lean-forward="true" selection-start-line="49" selection-start-column="46" selection-end-line="49" selection-end-column="46" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/application/home/bank.php">
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/index/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="342">
|
||||
<caret line="18" column="10" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="10" />
|
||||
<state relative-caret-position="330">
|
||||
<caret line="138" column="46" selection-start-line="138" selection-start-column="46" selection-end-line="138" selection-end-column="46" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#form#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#img#0;n#dd#1;n#div#0;n#tpshop#0;n#dl#0;n#tpshop#0;n#div#1;n#div#3;n#body#0;n#html#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -146,28 +162,7 @@
|
||||
</component>
|
||||
<component name="FindInProjectRecents">
|
||||
<findStrings>
|
||||
<find>请输入搜索关键字</find>
|
||||
<find>searchForm</find>
|
||||
<find>.ecsc-search-input</find>
|
||||
<find>ecsc-search-input</find>
|
||||
<find>tip</find>
|
||||
<find>bannersearch mw1000 h200</find>
|
||||
<find>ecsc-search-form</find>
|
||||
<find>search</find>
|
||||
<find>q</find>
|
||||
<find>tpshop_config</find>
|
||||
<find>hot_keywords</find>
|
||||
<find>index_hot_goods</find>
|
||||
<find>sx_topb ba-dark-bg</find>
|
||||
<find>__STATIC__/css</find>
|
||||
<find>font</find>
|
||||
<find>__STATIC__/img</find>
|
||||
<find>shop-list-splb p</find>
|
||||
<find>goodslist</find>
|
||||
<find>水彩</find>
|
||||
<find>floor-goods-list</find>
|
||||
<find>carousel clearfix</find>
|
||||
<find>cateList</find>
|
||||
<find>热门插图推荐</find>
|
||||
<find>$cateList</find>
|
||||
<find>分类筛选</find>
|
||||
@@ -176,20 +171,54 @@
|
||||
<find>googs-price</find>
|
||||
<find>__STATIC__/css/img</find>
|
||||
<find>floor-top</find>
|
||||
<find>推荐热卖</find>
|
||||
<find>更多选项</find>
|
||||
<find>综合</find>
|
||||
<find>cateTrre</find>
|
||||
<find>资深</find>
|
||||
<find>goods</find>
|
||||
<find>goodsINFO</find>
|
||||
<find>tpshop商城</find>
|
||||
<find>Tpshop商城</find>
|
||||
<find>imagestring</find>
|
||||
<find>imagecolorallocate</find>
|
||||
<find>水印</find>
|
||||
<find>cateList</find>
|
||||
<find>search</find>
|
||||
<find>virtual_order.html</find>
|
||||
<find>searc</find>
|
||||
<find><inc</find>
|
||||
<find>tpshop</find>
|
||||
<find>插画课程</find>
|
||||
<find>请输入</find>
|
||||
<find>shop</find>
|
||||
</findStrings>
|
||||
<replaceStrings>
|
||||
<replace>__STATIC__/css/webcss</replace>
|
||||
<replace />
|
||||
<replace>__STATIC__/css/img</replace>
|
||||
</replaceStrings>
|
||||
<dirStrings>
|
||||
<dir>D:\littleTiger\template\pc\rainbow\goods</dir>
|
||||
</dirStrings>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/template/pc/rainbow/static/css/base.css" />
|
||||
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
||||
<option value="$PROJECT_DIR$/template/pc/rainbow/index/index1111.html" />
|
||||
<option value="$PROJECT_DIR$/application/mobile/asdas.php" />
|
||||
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
||||
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
||||
<option value="$PROJECT_DIR$/template/pc/rainbow/public/header.html" />
|
||||
<option value="$PROJECT_DIR$/template/mobile/rainbow/goods/Listgoods.html" />
|
||||
<option value="$PROJECT_DIR$/template/pc/rainbow/goods/search.html" />
|
||||
<option value="$PROJECT_DIR$/application/home/controller/Article.php" />
|
||||
<option value="$PROJECT_DIR$/template/pc/rainbow/index/index.html" />
|
||||
<option value="$PROJECT_DIR$/template/pc/rainbow/article/listdd.html" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -250,9 +279,9 @@
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/yaml" />
|
||||
</include_path>
|
||||
</component>
|
||||
<component name="ProjectFrameBounds" extendedState="6">
|
||||
<option name="x" value="-8" />
|
||||
<option name="y" value="-8" />
|
||||
<component name="ProjectFrameBounds" extendedState="7">
|
||||
<option name="x" value="-433" />
|
||||
<option name="y" value="77" />
|
||||
<option name="width" value="1750" />
|
||||
<option name="height" value="970" />
|
||||
</component>
|
||||
@@ -261,55 +290,85 @@
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
<path>
|
||||
<item name="TPshop_20190115" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="TPshop_20190115" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="littleTiger" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="littleTiger" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="TPshop_20190115" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="TPshop_20190115" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="littleTiger" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="littleTiger" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="application" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="TPshop_20190115" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="TPshop_20190115" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="application" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="TPshop_20190115" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="TPshop_20190115" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="littleTiger" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="littleTiger" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="application" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="home" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="TPshop_20190115" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="TPshop_20190115" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="littleTiger" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="littleTiger" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="application" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="home" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="littleTiger" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="littleTiger" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="template" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="littleTiger" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="littleTiger" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="template" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="pc" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="littleTiger" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="littleTiger" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="template" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="pc" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="rainbow" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="littleTiger" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="littleTiger" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="template" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="pc" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="rainbow" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="article" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="littleTiger" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="littleTiger" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="template" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="pc" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="rainbow" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="index" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="last_opened_file_path" value="D:/eclipase_workspace/TPshop_20190115" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="D:\littleTiger\template\pc\rainbow\article" />
|
||||
<recent name="D:\littleTiger\template\mobile\rainbow\goods" />
|
||||
<recent name="D:\littleTiger\template\pc\rainbow\virtual" />
|
||||
<recent name="D:\littleTiger\template\pc\rainbow\goods" />
|
||||
<recent name="D:\TPshop_20190115\template\pc\rainbow\static\css" />
|
||||
<recent name="D:\TPshop_20190115\template\pc\rainbow\static\css\webcss" />
|
||||
<recent name="D:\TPshop_20190115\public" />
|
||||
<recent name="D:\TPshop_20190115\template\pc\rainbow\public" />
|
||||
<recent name="D:\TPshop_20190115\public\static" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
@@ -336,11 +395,12 @@
|
||||
<updated>1551241281315</updated>
|
||||
<workItem from="1551241282509" duration="23256000" />
|
||||
<workItem from="1551319168562" duration="24714000" />
|
||||
<workItem from="1551403261211" duration="24340000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="47970000" />
|
||||
<option name="totallyTimeSpent" value="72310000" />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
<todo-panel id="selected-file">
|
||||
@@ -353,8 +413,9 @@
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30170575" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30490404" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info id="Favorites" order="2" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
@@ -363,11 +424,11 @@
|
||||
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
||||
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
||||
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
||||
<window_info active="true" anchor="bottom" id="TODO" order="6" visible="true" weight="0.329718" />
|
||||
<window_info anchor="bottom" id="TODO" order="6" weight="0.330076" />
|
||||
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Terminal" order="10" weight="0.329718" />
|
||||
<window_info anchor="bottom" id="Version Control" order="9" />
|
||||
<window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.32899022" />
|
||||
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
|
||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
||||
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
||||
@@ -382,20 +443,6 @@
|
||||
<option name="myLimit" value="2678400000" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/user/reg.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="228">
|
||||
<caret line="12" column="86" selection-start-line="12" selection-start-column="86" selection-end-line="12" selection-end-column="86" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/public/header.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="681">
|
||||
<caret line="160" column="34" selection-start-line="160" selection-start-column="34" selection-end-line="160" selection-end-column="34" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/home/controller/Tperror.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="475">
|
||||
@@ -417,13 +464,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/home/controller/Base.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="437">
|
||||
<caret line="43" column="29" selection-start-line="43" selection-start-column="29" selection-end-line="43" selection-end-column="29" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/public/footer.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="380">
|
||||
@@ -487,13 +527,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/static/xiaohuzicss/basexiaohuzi.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="456">
|
||||
<caret line="24" column="19" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/command.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
@@ -504,14 +537,29 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/database.php_read">
|
||||
<entry file="file://$PROJECT_DIR$/application/home/config.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/goods/goodsList.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-225" />
|
||||
<state relative-caret-position="2204">
|
||||
<caret line="116" column="45" selection-start-line="112" selection-start-column="40" selection-end-line="116" selection-end-column="45" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/database.php_read">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/database.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="380">
|
||||
<caret line="28" column="20" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/home/common.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="359">
|
||||
<state relative-caret-position="665">
|
||||
<caret line="35" column="1" selection-start-line="35" selection-start-column="1" selection-end-line="35" selection-end-column="1" />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -523,67 +571,194 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/home/config.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/database.php">
|
||||
<entry file="file://$PROJECT_DIR$/application/common.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="380">
|
||||
<caret line="28" column="20" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="261">
|
||||
<caret line="277" column="63" selection-start-line="277" selection-start-column="56" selection-end-line="277" selection-end-column="63" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/goods/goodsList.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="413">
|
||||
<caret line="116" column="45" selection-start-line="112" selection-start-column="40" selection-end-line="116" selection-end-column="45" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="437">
|
||||
<caret line="51" column="51" selection-start-line="51" selection-start-column="51" selection-end-line="51" selection-end-column="51" />
|
||||
<folding>
|
||||
<element signature="e#545#560#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
<state relative-caret-position="444">
|
||||
<caret line="1043" column="13" selection-start-line="1043" selection-start-column="13" selection-end-line="1043" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/static/css/tpshop.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="311">
|
||||
<caret line="1713" column="35" selection-start-line="1713" selection-start-column="35" selection-end-line="1713" selection-end-column="35" />
|
||||
<state relative-caret-position="596">
|
||||
<caret line="1710" column="15" selection-start-line="1710" selection-start-column="15" selection-end-line="1710" selection-end-column="15" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/index/index.html">
|
||||
<entry file="file://$PROJECT_DIR$/application/home/controller/Base.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="228">
|
||||
<caret line="80" column="39" lean-forward="true" selection-start-line="80" selection-start-column="39" selection-end-line="80" selection-end-column="39" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#form#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
||||
<element signature="n#div#4;n#body#0;n#html#0;n#!!top" />
|
||||
</folding>
|
||||
<state relative-caret-position="284">
|
||||
<caret line="52" column="48" selection-start-line="52" selection-start-column="48" selection-end-line="52" selection-end-column="48" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="360">
|
||||
<caret line="660" column="32" lean-forward="true" selection-start-line="660" selection-start-column="32" selection-end-line="660" selection-end-column="32" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/mobile/asdas.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="247">
|
||||
<caret line="18" column="66" selection-start-line="18" selection-start-column="66" selection-end-line="18" selection-end-column="66" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/common/model/Goods.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="266">
|
||||
<caret line="116" column="9" lean-forward="true" selection-start-line="116" selection-start-column="9" selection-end-line="116" selection-end-column="9" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/index/index1111.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="209">
|
||||
<caret line="132" column="34" lean-forward="true" selection-start-line="132" selection-start-column="34" selection-end-line="132" selection-end-column="34" />
|
||||
<state relative-caret-position="482">
|
||||
<caret line="277" column="36" selection-start-line="277" selection-start-column="36" selection-end-line="277" selection-end-column="36" />
|
||||
<folding>
|
||||
<element signature="n#script#0;n#div#0;n#body#0;n#html#0;n#!!top" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/plugins/login/alipaynew/lotusphp_runtime/Captcha/CaptchaImageEngine.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="254">
|
||||
<caret line="54" column="30" selection-start-line="54" selection-start-column="30" selection-end-line="54" selection-end-column="30" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/Verify.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="273">
|
||||
<caret line="224" column="16" selection-start-line="224" selection-start-column="16" selection-end-line="224" selection-end-column="16" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/admin/view/system/water.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1064">
|
||||
<caret line="56" column="96" selection-start-line="56" selection-start-column="96" selection-end-line="56" selection-end-column="96" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1311">
|
||||
<caret line="88" column="10" selection-start-line="88" selection-start-column="10" selection-end-line="88" selection-end-column="10" />
|
||||
<folding>
|
||||
<element signature="e#545#560#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/virtual/virtual_order.html">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/static/xiaohuzicss/basexiaohuzi.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-1710">
|
||||
<caret line="1698" column="1" selection-start-line="1698" selection-start-column="1" selection-end-line="1698" selection-end-column="1" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/mobile/rainbow/virtual/virtual_order.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="190">
|
||||
<caret line="10" column="28" selection-start-line="10" selection-start-column="28" selection-end-line="10" selection-end-column="28" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="197">
|
||||
<caret line="304" column="53" selection-start-line="304" selection-start-column="53" selection-end-line="304" selection-end-column="53" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/goods/goodsInfo.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="475">
|
||||
<caret line="25" column="26" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/goods/search.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="424">
|
||||
<caret line="43" column="39" selection-start-line="43" selection-start-column="39" selection-end-line="43" selection-end-column="39" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/user/reg.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="285">
|
||||
<caret line="15" column="7" selection-start-line="15" selection-start-column="7" selection-end-line="15" selection-end-column="7" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/public/header.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="133">
|
||||
<caret line="25" selection-start-line="25" selection-end-line="25" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#form#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#a#0;n#div#0;n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#a#0;n#div#1;n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/mobile/rainbow/goods/goodsInfo.html">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/mobile/rainbow/goods/goodsList.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="399">
|
||||
<caret line="21" column="16" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/admin/controller/Article.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="361">
|
||||
<caret line="205" column="9" lean-forward="true" selection-start-line="205" selection-start-column="9" selection-end-line="205" selection-end-column="9" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/application/home/controller/Article.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="283">
|
||||
<caret line="49" column="46" lean-forward="true" selection-start-line="49" selection-start-column="46" selection-end-line="49" selection-end-column="46" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/mobile/rainbow/goods/Listgoods.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="969">
|
||||
<caret line="51" column="93" selection-start-line="51" selection-start-column="93" selection-end-line="51" selection-end-column="93" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/index/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="330">
|
||||
<caret line="138" column="46" selection-start-line="138" selection-start-column="46" selection-end-line="138" selection-end-column="46" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#form#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#img#0;n#dd#1;n#div#0;n#tpshop#0;n#dl#0;n#tpshop#0;n#div#1;n#div#3;n#body#0;n#html#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/template/pc/rainbow/article/listdd.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="380">
|
||||
<caret line="56" column="78" selection-start-line="56" selection-start-column="78" selection-end-line="56" selection-end-column="78" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
</project>
|
@@ -39,6 +39,13 @@
|
||||
<div style="text-align: center; width: 120px;" class="">{$list.add_time|date='Y-m-d H:i:s',###}</div>
|
||||
</td>
|
||||
<td align="center" abbr="article_time" axis="col6" class="">
|
||||
<div style="text-align: center; width: 120px;" class="">{$list.dess}</div>
|
||||
</td>
|
||||
<td align="center" abbr="article_time" axis="col6" class="">
|
||||
<div style="text-align: center; width: 120px;" class="">{$list.model}</div>
|
||||
</td>
|
||||
|
||||
<td align="center" abbr="article_time" axis="col6" class="">
|
||||
<div style="text-align: center; width: 160px;" class="">
|
||||
<a class="btn green" style="display:" href="{:U('Comment/consult_info',array('id'=>$list[id]))}"><i class="fa fa-list-alt"></i>查看</a>
|
||||
</div>
|
||||
|
@@ -68,6 +68,12 @@
|
||||
</th>
|
||||
<th align="center" abbr="article_time" axis="col6" class="">
|
||||
<div style="text-align: center; width: 120px;" class="">咨询时间</div>
|
||||
</th>
|
||||
<th align="center" abbr="article_time" axis="col6" class="">
|
||||
<div style="text-align: center; width: 120px;" class="">建议</div>
|
||||
</th>
|
||||
<th align="center" abbr="article_time" axis="col6" class="">
|
||||
<div style="text-align: center; width: 120px;" class="">电话</div>
|
||||
</th>
|
||||
<th align="center" abbr="article_time" axis="col6" class="">
|
||||
<div style="text-align: center; width: 160px;" class=""> 操作</div>
|
||||
|
@@ -45,6 +45,17 @@ class Article extends Base {
|
||||
return $this->fetch();
|
||||
}
|
||||
|
||||
public function listdd(){
|
||||
$article_id = I('article_id/d',1);
|
||||
$article = Db::name('article')->where("article_id", $article_id)->find();
|
||||
if($article){
|
||||
$parent = Db::name('article_cat')->where("cat_id",$article['cat_id'])->find();
|
||||
$this->assign('cat_name',$parent['cat_name']);
|
||||
$this->assign('article',$article);
|
||||
}
|
||||
return $this->fetch();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取服务协议
|
||||
* @return mixed
|
||||
|
@@ -271,7 +271,7 @@ class Goods extends Base
|
||||
$end_price = trim(I('end_price', '0')); // 输入框价钱
|
||||
if ($start_price && $end_price) $price = $start_price . '-' . $end_price; // 如果输入框有价钱 则使用输入框的价钱
|
||||
$q = urldecode(trim(I('q', ''))); // 关键字搜索
|
||||
empty($q) && $this->error('请输入搜索词');
|
||||
// empty($q) && $this->error('请输入搜索词');
|
||||
$id && ($filter_param['id'] = $id); //加入帅选条件中
|
||||
$brand_id && ($filter_param['brand_id'] = $brand_id); //加入帅选条件中
|
||||
$price && ($filter_param['price'] = $price); //加入帅选条件中
|
||||
|
68
application/home/controller/Illustrations.php
Normal file
@@ -0,0 +1,68 @@
|
||||
<?php
|
||||
/**
|
||||
* tpshop
|
||||
* ============================================================================
|
||||
* * 版权所有 2015-2027 深圳搜豹网络科技有限公司,并保留所有权利。
|
||||
* 网站地址: http://www.tp-shop.cn
|
||||
* ----------------------------------------------------------------------------
|
||||
* 这不是一个自由软件!您只能在不用于商业目的的前提下对程序代码进行修改和使用 .
|
||||
* 不允许对程序代码以任何形式任何目的的再发布。
|
||||
* 采用最新Thinkphp5助手函数特性实现单字母函数M D U等简写方式
|
||||
* ============================================================================
|
||||
* $Author: IT宇宙人 2015-08-10 $
|
||||
*/
|
||||
|
||||
namespace app\home\controller;
|
||||
|
||||
|
||||
use app\common\logic\FreightLogic;
|
||||
use app\common\logic\GoodsPromFactory;
|
||||
use app\common\logic\SearchWordLogic;
|
||||
use app\common\logic\GoodsLogic;
|
||||
use app\common\model\Combination;
|
||||
use app\common\model\SpecGoodsPrice;
|
||||
use app\common\util\TpshopException;
|
||||
use think\AjaxPage;
|
||||
use think\Page;
|
||||
use think\Validate;
|
||||
use think\Verify;
|
||||
use think\Db;
|
||||
use think\Cookie;
|
||||
use think\Log;
|
||||
class Illustrations extends Base
|
||||
|
||||
{
|
||||
public function illustrations()
|
||||
{
|
||||
return $this->fetch();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 商品咨询
|
||||
*/
|
||||
public function consult()
|
||||
{
|
||||
|
||||
$username = input("username", 'TPshop用户'); // 网友咨询
|
||||
$content = trim(input("content", '')); // 咨询内容
|
||||
$dess = trim(input("dess", '')); // 咨询内容
|
||||
$model = trim(input("model", '')); // 咨询内容
|
||||
|
||||
$data = array(
|
||||
'username' => $username,
|
||||
'content' => $content,
|
||||
'dess' => $dess,
|
||||
'model' => $model,
|
||||
'is_show' => 1,
|
||||
'add_time' => time(),
|
||||
);
|
||||
|
||||
|
||||
Db::name('goodsConsult')->add($data);
|
||||
$this->ajaxReturn(['status' => 1, 'msg' => '咨询已提交!']);
|
||||
}
|
||||
|
||||
|
||||
}
|
@@ -30,6 +30,7 @@ class Index extends Base {
|
||||
$sql = "select a.goods_name,a.goods_id,a.shop_price,a.market_price,a.cat_id,b.parent_id_path,b.name from ".C('database.prefix')."goods as a left join ";
|
||||
$sql .= C('database.prefix')."goods_category as b on a.cat_id=b.id where a.is_hot=1 and a.is_on_sale=1 order by a.sort";//二级分类下热卖商品
|
||||
$index_hot_goods = S('index_hot_goods');
|
||||
//如果缓存没有index_hot_goods那么用$sql数据库查询首页也买商品
|
||||
if(empty($index_hot_goods))
|
||||
{
|
||||
$index_hot_goods = Db::query($sql);//首页热卖商品
|
||||
|
BIN
public/static/images/buttonhu.jpg
Normal file
After Width: | Height: | Size: 7.1 KiB |
BIN
public/static/images/dcf03c3256456863f9538046fda7417.png
Normal file
After Width: | Height: | Size: 50 KiB |
BIN
public/static/images/tigehu.jpg
Normal file
After Width: | Height: | Size: 2.7 KiB |
BIN
public/static/images/xiaohuzhi.png
Normal file
After Width: | Height: | Size: 47 KiB |
BIN
public/static/images/xihuzi.png
Normal file
After Width: | Height: | Size: 133 KiB |
64373
public/tpshop2.0.sql
Normal file
After Width: | Height: | Size: 138 KiB |
After Width: | Height: | Size: 25 KiB |
After Width: | Height: | Size: 59 KiB |
After Width: | Height: | Size: 138 KiB |
After Width: | Height: | Size: 9.0 KiB |
After Width: | Height: | Size: 32 KiB |
After Width: | Height: | Size: 32 KiB |
After Width: | Height: | Size: 12 KiB |
After Width: | Height: | Size: 35 KiB |
After Width: | Height: | Size: 40 KiB |
After Width: | Height: | Size: 12 KiB |
After Width: | Height: | Size: 32 KiB |
After Width: | Height: | Size: 35 KiB |
After Width: | Height: | Size: 32 KiB |
After Width: | Height: | Size: 35 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_1_236_236.jpeg
Normal file
After Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 38 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_1_400_400.jpeg
Normal file
After Width: | Height: | Size: 54 KiB |
Before Width: | Height: | Size: 98 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_1_60_60.jpeg
Normal file
After Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 3.7 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_1_800_800.jpeg
Normal file
After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 188 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_948_236_236.jpeg
Normal file
After Width: | Height: | Size: 52 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_948_400_400.jpeg
Normal file
After Width: | Height: | Size: 54 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_948_60_60.jpeg
Normal file
After Width: | Height: | Size: 5.3 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_948_800_800.jpeg
Normal file
After Width: | Height: | Size: 58 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_949_236_236.jpeg
Normal file
After Width: | Height: | Size: 47 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_949_400_400.jpeg
Normal file
After Width: | Height: | Size: 93 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_949_60_60.jpeg
Normal file
After Width: | Height: | Size: 5.3 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_949_800_800.jpeg
Normal file
After Width: | Height: | Size: 106 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_950_236_236.jpeg
Normal file
After Width: | Height: | Size: 47 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_950_400_400.jpeg
Normal file
After Width: | Height: | Size: 93 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_950_60_60.jpeg
Normal file
After Width: | Height: | Size: 5.3 KiB |
BIN
public/upload/goods/thumb/1/goods_sub_thumb_950_800_800.jpeg
Normal file
After Width: | Height: | Size: 107 KiB |
Before Width: | Height: | Size: 19 KiB |
BIN
public/upload/goods/thumb/1/goods_thumb_1_0_180_180.jpeg
Normal file
After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 28 KiB |
BIN
public/upload/goods/thumb/1/goods_thumb_1_0_236_236.jpeg
Normal file
After Width: | Height: | Size: 47 KiB |
Before Width: | Height: | Size: 38 KiB |
BIN
public/upload/goods/thumb/1/goods_thumb_1_0_400_400.jpeg
Normal file
After Width: | Height: | Size: 93 KiB |
Before Width: | Height: | Size: 98 KiB |
BIN
public/upload/goods/thumb/1/goods_thumb_1_0_800_800.jpeg
Normal file
After Width: | Height: | Size: 107 KiB |
Before Width: | Height: | Size: 188 KiB |
BIN
public/upload/goods/thumb/16/goods_sub_thumb_69_400_400.png
Normal file
After Width: | Height: | Size: 135 KiB |
BIN
public/upload/goods/thumb/16/goods_sub_thumb_69_60_60.png
Normal file
After Width: | Height: | Size: 5.2 KiB |
BIN
public/upload/goods/thumb/16/goods_sub_thumb_69_800_800.png
Normal file
After Width: | Height: | Size: 252 KiB |
BIN
public/upload/goods/thumb/16/goods_sub_thumb_70_400_400.png
Normal file
After Width: | Height: | Size: 55 KiB |
BIN
public/upload/goods/thumb/16/goods_sub_thumb_70_60_60.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
public/upload/goods/thumb/16/goods_sub_thumb_70_800_800.png
Normal file
After Width: | Height: | Size: 37 KiB |
BIN
public/upload/goods/thumb/16/goods_sub_thumb_71_400_400.png
Normal file
After Width: | Height: | Size: 55 KiB |
BIN
public/upload/goods/thumb/16/goods_sub_thumb_71_60_60.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
public/upload/goods/thumb/16/goods_sub_thumb_71_800_800.png
Normal file
After Width: | Height: | Size: 32 KiB |
BIN
public/upload/goods/thumb/16/goods_sub_thumb_72_400_400.png
Normal file
After Width: | Height: | Size: 62 KiB |
BIN
public/upload/goods/thumb/16/goods_sub_thumb_72_60_60.png
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
public/upload/goods/thumb/16/goods_sub_thumb_72_800_800.png
Normal file
After Width: | Height: | Size: 58 KiB |
BIN
public/upload/goods/thumb/16/goods_thumb_16_0_800_800.png
Normal file
After Width: | Height: | Size: 252 KiB |
BIN
public/upload/goods/thumb/222/goods_sub_thumb_904_236_236.jpeg
Normal file
After Width: | Height: | Size: 38 KiB |
BIN
public/upload/goods/thumb/222/goods_sub_thumb_905_236_236.jpeg
Normal file
After Width: | Height: | Size: 36 KiB |
BIN
public/upload/goods/thumb/222/goods_sub_thumb_906_236_236.jpeg
Normal file
After Width: | Height: | Size: 36 KiB |
BIN
public/upload/goods/thumb/222/goods_thumb_222_0_236_236.jpeg
Normal file
After Width: | Height: | Size: 36 KiB |
BIN
public/upload/goods/thumb/224/goods_thumb_224_0_238_200.jpeg
Normal file
After Width: | Height: | Size: 21 KiB |
BIN
public/upload/goods/thumb/225/goods_sub_thumb_913_236_236.jpeg
Normal file
After Width: | Height: | Size: 23 KiB |
BIN
public/upload/goods/thumb/225/goods_sub_thumb_914_236_236.jpeg
Normal file
After Width: | Height: | Size: 26 KiB |
BIN
public/upload/goods/thumb/225/goods_sub_thumb_915_236_236.jpeg
Normal file
After Width: | Height: | Size: 22 KiB |
BIN
public/upload/goods/thumb/225/goods_sub_thumb_916_236_236.jpeg
Normal file
After Width: | Height: | Size: 22 KiB |
BIN
public/upload/goods/thumb/225/goods_sub_thumb_917_236_236.jpeg
Normal file
After Width: | Height: | Size: 32 KiB |
BIN
public/upload/goods/thumb/225/goods_sub_thumb_918_236_236.jpeg
Normal file
After Width: | Height: | Size: 23 KiB |
BIN
public/upload/goods/thumb/225/goods_sub_thumb_919_236_236.jpeg
Normal file
After Width: | Height: | Size: 23 KiB |
BIN
public/upload/goods/thumb/226/goods_thumb_226_0_238_200.png
Normal file
After Width: | Height: | Size: 78 KiB |
BIN
public/upload/goods/thumb/227/goods_thumb_227_0_238_200.jpeg
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
public/upload/goods/thumb/228/goods_sub_thumb_925_236_236.jpeg
Normal file
After Width: | Height: | Size: 20 KiB |
BIN
public/upload/goods/thumb/228/goods_sub_thumb_926_236_236.jpeg
Normal file
After Width: | Height: | Size: 22 KiB |
BIN
public/upload/goods/thumb/228/goods_sub_thumb_927_236_236.jpeg
Normal file
After Width: | Height: | Size: 22 KiB |
BIN
public/upload/goods/thumb/228/goods_thumb_228_0_236_236.jpeg
Normal file
After Width: | Height: | Size: 22 KiB |
BIN
public/upload/goods/thumb/231/goods_sub_thumb_936_236_236.jpeg
Normal file
After Width: | Height: | Size: 15 KiB |
BIN
public/upload/goods/thumb/231/goods_thumb_231_0_236_236.jpeg
Normal file
After Width: | Height: | Size: 15 KiB |
BIN
public/upload/goods/thumb/239/goods_sub_thumb_947_236_236.jpeg
Normal file
After Width: | Height: | Size: 52 KiB |
BIN
public/upload/goods/thumb/239/goods_sub_thumb_947_400_400.jpeg
Normal file
After Width: | Height: | Size: 54 KiB |
BIN
public/upload/goods/thumb/239/goods_sub_thumb_947_60_60.jpeg
Normal file
After Width: | Height: | Size: 5.3 KiB |
BIN
public/upload/goods/thumb/239/goods_sub_thumb_947_800_800.jpeg
Normal file
After Width: | Height: | Size: 58 KiB |
BIN
public/upload/goods/thumb/239/goods_thumb_239_0_206_206.jpeg
Normal file
After Width: | Height: | Size: 38 KiB |
BIN
public/upload/goods/thumb/239/goods_thumb_239_0_236_236.jpeg
Normal file
After Width: | Height: | Size: 52 KiB |
BIN
public/upload/goods/thumb/239/goods_thumb_239_0_400_400.jpeg
Normal file
After Width: | Height: | Size: 54 KiB |
BIN
public/upload/goods/thumb/239/goods_thumb_239_0_800_800.jpeg
Normal file
After Width: | Height: | Size: 58 KiB |