郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 03076b97d0662c9c8070f660d8348824eb7cedd3 1 个父辈 a3ac49b4
1 个管道 的构建 通过 耗费 1 秒

加入我们

内嵌 并排对比
正在显示 5 个修改的文件 包含 456 行增加 和 126 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="" />
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" afterPath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -22,11 +28,37 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="database.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/data/conf/database.php">
<file leaf-file-name="ProjectController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="12" column="10" lean-forward="true" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
<state relative-caret-position="550">
<caret line="111" column="28" lean-forward="false" selection-start-line="111" selection-start-column="28" selection-end-line="111" selection-end-column="28" />
<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>
</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="627">
<caret line="41" column="17" lean-forward="true" selection-start-line="41" selection-start-column="17" selection-end-line="41" selection-end-column="17" />
<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="302">
<caret line="37" column="20" lean-forward="true" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
<folding />
</state>
</provider>
... ... @@ -47,8 +79,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/service.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ServiceController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/select.html" />
... ... @@ -92,12 +122,14 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/edit.html" />
<option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/about/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/AboutController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/select.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
<option value="$PROJECT_DIR$/data/conf/database.php" />
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
<option value="$PROJECT_DIR$/app/admin/controller/AboutController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
</list>
</option>
</component>
... ... @@ -109,10 +141,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="311" />
<option name="y" value="97" />
<option name="width" value="1512" />
<option name="height" value="1071" />
<option name="x" value="181" />
<option name="y" value="136" />
<option name="width" value="1678" />
<option name="height" value="1089" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -139,13 +171,73 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" 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" />
</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" />
</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="admin_simpleboot3" 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="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" 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="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="about" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="conf" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="project" 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="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="rtype" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -180,6 +272,9 @@
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="" />
... ... @@ -210,18 +305,18 @@
<workItem from="1573431784419" duration="6182000" />
<workItem from="1573448892997" duration="1343000" />
<workItem from="1573450754427" duration="9613000" />
<workItem from="1573463816109" duration="687000" />
<workItem from="1573463816109" duration="4867000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="179663000" />
<option name="totallyTimeSpent" value="183843000" />
</component>
<component name="ToolWindowManager">
<frame x="311" y="97" width="1512" height="1071" extended-state="1" />
<frame x="181" y="136" width="1678" height="1089" 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.21831957" 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.1724351" 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" />
... ... @@ -272,70 +367,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/no_recycle/showgoods.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="37" lean-forward="false" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/no_recycle/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="54" column="65" lean-forward="false" selection-start-line="54" selection-start-column="65" selection-end-line="54" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/no_recycle/editgoods.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="19" column="55" lean-forward="true" selection-start-line="19" selection-start-column="55" selection-end-line="19" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/recycle/addgoods.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-325">
<caret line="14" column="32" lean-forward="true" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/no_recycle/addgoods.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="825">
<caret line="48" column="102" lean-forward="false" selection-start-line="48" selection-start-column="102" selection-end-line="48" selection-end-column="102" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/NoRecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="518">
<caret line="147" column="70" lean-forward="false" selection-start-line="147" selection-start-column="70" selection-end-line="147" selection-end-column="70" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rgoods/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-28">
<caret line="13" column="4" lean-forward="true" selection-start-line="13" selection-start-column="4" selection-end-line="18" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shop_pic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-675">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="40" column="38" lean-forward="true" selection-start-line="40" selection-start-column="38" selection-end-line="40" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/model/Recycle.php" />
<entry file="file://$PROJECT_DIR$/app/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="733">
... ... @@ -354,6 +385,7 @@
<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" />
<folding />
</state>
</provider>
</entry>
... ... @@ -389,6 +421,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1118">
<caret line="135" column="23" lean-forward="false" selection-start-line="135" selection-start-column="23" selection-end-line="135" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
... ... @@ -504,17 +537,14 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="8" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="61" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="456">
<caret line="92" column="15" lean-forward="true" selection-start-line="92" selection-start-column="15" selection-end-line="92" selection-end-column="15" />
<folding>
<element signature="e#266#1001#0#PHP" expanded="false" />
<element signature="e#3943#4413#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -525,20 +555,6 @@
</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="350">
<caret line="20" column="78" lean-forward="true" selection-start-line="20" selection-start-column="78" selection-end-line="20" selection-end-column="78" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="59" column="21" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="181" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
... ... @@ -564,20 +580,13 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/AboutController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="17" column="4" lean-forward="false" selection-start-line="17" selection-start-column="4" selection-end-line="45" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/about/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="33" column="52" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="129" selection-end-column="0" />
<folding>
<element signature="e#131#170#0#PHP" expanded="true" />
<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" />
<element signature="e#3746#4212#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -602,13 +611,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="350">
<caret line="47" column="0" lean-forward="true" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
... ... @@ -625,5 +627,143 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/AboutController.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/RgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="97">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
<folding>
<element signature="e#263#998#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/RecycleController.php">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/RtypeController.php">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/HomePicController.php">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="41" column="8" lean-forward="false" selection-start-line="41" selection-start-column="8" selection-end-line="42" selection-end-column="87" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="8" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="61" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1131">
<caret line="59" column="21" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="181" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="29" column="28" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="70" selection-end-column="7" />
<folding />
</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="302">
<caret line="37" column="20" lean-forward="true" 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">
<caret line="20" column="78" lean-forward="true" selection-start-line="20" selection-start-column="78" selection-end-line="20" selection-end-column="78" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rtype/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="37" column="11" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/about/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="538">
<caret line="52" column="20" lean-forward="false" selection-start-line="52" selection-start-column="20" selection-end-line="57" selection-end-column="25" />
<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="627">
<caret line="41" column="17" lean-forward="true" selection-start-line="41" selection-start-column="17" selection-end-line="41" selection-end-column="17" />
<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="111" column="28" lean-forward="false" selection-start-line="111" selection-start-column="28" selection-end-line="111" selection-end-column="28" />
<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>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -76,4 +76,49 @@ class ProjectController extends AdminBaseController
return $this->fetch();
}
}
//加入我们信息列表
public function addlist()
{
$where['delete_time'] = ['eq',0];
$param = $this->request->param();
$startTime = empty($param['start_time']) ? '' : strtotime($param['start_time']);
$endTime = empty($param['end_time']) ? '' : (strtotime($param['end_time']));
if (!empty($startTime) && !empty($endTime)) {
$where['create_time'] = [['>= time', $startTime], ['<= time', $endTime]];
} else {
if (!empty($startTime)) {
$where['create_time'] = ['>= time', $startTime];
}
if (!empty($endTime)) {
$where['create_time'] = ['<= time', $endTime];
}
}
$data = Db::name('join')
->where($where)
->order('id desc')
->paginate(10);
$list=$data->items();
$this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
$this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : '');
$this->assign([
'data'=>$list,
'page'=>$data->render(),
]);
return $this->fetch();
}
//加入我们信息详情
public function detail()
{
$param = $this->request->param();
$id = $this->request->param('id', 1, 'intval');
$data = Db::name('join')
->where('id',$id)
->find();
$this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
$this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : '');
$this->assign('data',$data);
return $this->fetch();
}
}
\ No newline at end of file
... ...
... ... @@ -55,6 +55,7 @@ return array (
'ADMIN_PLUGIN_UNINSTALL' => '卸载插件',
'ADMIN_PLUGIN_UPDATE' => '插件更新',
'ADMIN_POINT_INDEX' => '回收站列表',
'ADMIN_PROJECT_ADDLIST' => '加入我们信息列表',
'ADMIN_PROJECT_INDEX' => '产品方案',
'ADMIN_PROJECT_SELECT' => '加入我们',
'ADMIN_RBAC_AUTHORIZE' => '设置角色权限',
... ...
<include file="public@header" />
</head>
<style>
th,td{
text-align: center;
}
</style>
<body>
<div class="wrap js-check-wrap">
<ul class="nav nav-tabs">
<li class="active"><a href="{:url('project/addlist')}">商品订单列表</a></li>
</ul>
<form class="well form-inline margin-top-20" method="post" action="{:url('project/addlist')}">
时间:
<input type="text" class="form-control js-bootstrap-date" name="start_time"
value="{$start_time|default=''}"
style="width: 140px;" autocomplete="off">-
<input type="text" class="form-control js-bootstrap-date" name="end_time"
value="{$end_time|default=''}"
style="width: 140px;" autocomplete="off"> &nbsp; &nbsp;
<input type="submit" class="btn btn-primary" value="搜索" />
<a class="btn btn-danger" href="{:url('project/addlist')}">清空</a>
</form>
<form class="js-ajax-form" action="" method="post">
<table class="table table-hover table-bordered">
<thead>
<tr>
<th>ID</th>
<th>姓名</th>
<th>电话</th>
<th>邮箱</th>
<th>创建时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<foreach name="data" item="vo">
<tr>
<td>{$vo.id}</td>
<td>{$vo.name}</td>
<td>{$vo.phone}</td>
<td>{$vo.email}</td>
<td>{:date('Y-m-d H:i:s',$vo.create_time)}</td>
<td>
<a href='{:url("project/detail",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>|
</td>
</tr>
</foreach>
</tbody>
</table>
<div class="pagination">{$page}</div>
</form>
</div>
<script src="__STATIC__/js/admin.js"></script>
</body>
</html>
\ No newline at end of file
... ...
<include file="public@header"/>
</head>
<body>
<!--<script type="text/html" id="photos-item-tpl">-->
<!--<li id="saved-image{id}">-->
<!--<input id="photo-{id}" type="hidden" name="photo_urls[]" value="{filepath}">-->
<!--<input class="form-control" id="photo-{id}-name" type="text" name="photo_names[]" value="{name}"-->
<!--style="width: 200px;" title="图片名称">-->
<!--<img id="photo-{id}-preview" src="{url}" style="height:36px;width: 36px;"-->
<!--onclick="imagePreviewDialog(this.src);">-->
<!--<a href="javascript:uploadOneImage('图片上传','#photo-{id}');">替换</a>-->
<!--<a href="javascript:(function(){$('#saved-image{id}').remove();})();">移除</a>-->
<!--</li>-->
<!--</script>-->
<div class="wrap js-check-wrap">
<ul class="nav nav-tabs">
<li><a href="{:url('project/addlist')}">加入我们信息列表</a></li>
<li class="active"><a href="#">查看详情</a></li>
</ul>
<form action="{:url('rtype/edit')}" method="post" class="form-horizontal js-ajax-form margin-top-20">
<table class="table table-bordered">
<tr>
<th width="100">姓名</th>
<td>
<input class="form-control" type="text" name="name"
id="name" value="{$data.name}" placeholder="请输入分类名称"/>
</td>
</tr>
<tr>
<th width="100">电话</th>
<td>
<input class="form-control" type="text" name="phone"
id="phone" value="{$data.phone}" placeholder="请输入联系方式"/>
</td>
</tr>
<tr>
<th width="100">邮箱</th>
<td>
<input class="form-control" type="text" name="email"
id="email" value="{$data.email}" placeholder="请输入邮箱"/>
</td>
</tr>
<tr>
<th width="100">加盟信息</th>
<td>
<script type="text/plain" id="content" name="content">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.content))}</script>
</td>
</tr>
</table>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<a class="btn btn-default" href="{:url('project/addlist',array('start_time'=>$start_time,'end_time=>$end_time'))}">{:lang('BACK')}</a>
</div>
</div>
</form>
</div>
<script type="text/javascript" src="__STATIC__/js/admin.js"></script>
<script type="text/javascript">
//编辑器路径定义
var editorURL = GV.WEB_ROOT;
</script>
<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.config.js"></script>
<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.all.min.js"></script>
<script type="text/javascript">
$(function () {
editorcontent = new baidu.editor.ui.Editor();
editorcontent.render('content');
try {
editorcontent.sync();
} catch (err) {
}
$('.btn-cancel-thumbnail').click(function () {
$('#thumbnail-preview').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
$('#thumbnail').val('');
});
$('.btn-cancel-thumbnail1').click(function () {
$('#thumbnail-preview1').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
$('#thumbnail1').val('');
});
});
</script>
</body>
</html>
... ...