郭盛 / scrap · 提交

转到一个项目

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

加入我们

内嵌 并排对比
正在显示 5 个修改的文件 包含 456 行增加 和 126 行删除
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 - <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="" /> 4 + <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
  5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
  6 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" afterPath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" />
  10 + </list>
5 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
6 <option name="TRACKING_ENABLED" value="true" /> 12 <option name="TRACKING_ENABLED" value="true" />
7 <option name="SHOW_DIALOG" value="false" /> 13 <option name="SHOW_DIALOG" value="false" />
@@ -22,11 +28,37 @@ @@ -22,11 +28,37 @@
22 </component> 28 </component>
23 <component name="FileEditorManager"> 29 <component name="FileEditorManager">
24 <leaf> 30 <leaf>
25 - <file leaf-file-name="database.php" pinned="false" current-in-tab="true">  
26 - <entry file="file://$PROJECT_DIR$/data/conf/database.php"> 31 + <file leaf-file-name="ProjectController.php" pinned="false" current-in-tab="true">
  32 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
27 <provider selected="true" editor-type-id="text-editor"> 33 <provider selected="true" editor-type-id="text-editor">
28 - <state relative-caret-position="250">  
29 - <caret line="12" column="10" lean-forward="true" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" /> 34 + <state relative-caret-position="550">
  35 + <caret line="111" column="28" lean-forward="false" selection-start-line="111" selection-start-column="28" selection-end-line="111" selection-end-column="28" />
  36 + <folding>
  37 + <element signature="e#131#170#0#PHP" expanded="true" />
  38 + <element signature="e#275#1168#0#PHP" expanded="false" />
  39 + <element signature="e#1185#2077#0#PHP" expanded="false" />
  40 + <element signature="e#2098#3253#0#PHP" expanded="false" />
  41 + <element signature="e#3274#3743#0#PHP" expanded="false" />
  42 + </folding>
  43 + </state>
  44 + </provider>
  45 + </entry>
  46 + </file>
  47 + <file leaf-file-name="detail.html" pinned="false" current-in-tab="false">
  48 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">
  49 + <provider selected="true" editor-type-id="text-editor">
  50 + <state relative-caret-position="627">
  51 + <caret line="41" column="17" lean-forward="true" selection-start-line="41" selection-start-column="17" selection-end-line="41" selection-end-column="17" />
  52 + <folding />
  53 + </state>
  54 + </provider>
  55 + </entry>
  56 + </file>
  57 + <file leaf-file-name="addlist.html" pinned="false" current-in-tab="false">
  58 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">
  59 + <provider selected="true" editor-type-id="text-editor">
  60 + <state relative-caret-position="302">
  61 + <caret line="37" column="20" lean-forward="true" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
30 <folding /> 62 <folding />
31 </state> 63 </state>
32 </provider> 64 </provider>
@@ -47,8 +79,6 @@ @@ -47,8 +79,6 @@
47 <component name="IdeDocumentHistory"> 79 <component name="IdeDocumentHistory">
48 <option name="CHANGED_PATHS"> 80 <option name="CHANGED_PATHS">
49 <list> 81 <list>
50 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" />  
51 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" />  
52 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/service.html" /> 82 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/service.html" />
53 <option value="$PROJECT_DIR$/app/admin/controller/ServiceController.php" /> 83 <option value="$PROJECT_DIR$/app/admin/controller/ServiceController.php" />
54 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/select.html" /> 84 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/select.html" />
@@ -92,12 +122,14 @@ @@ -92,12 +122,14 @@
92 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/edit.html" /> 122 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/edit.html" />
93 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" /> 123 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
94 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/about/index.html" /> 124 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/about/index.html" />
95 - <option value="$PROJECT_DIR$/app/admin/controller/AboutController.php" />  
96 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/index.html" /> 125 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/index.html" />
97 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/select.html" /> 126 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/select.html" />
98 - <option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />  
99 <option value="$PROJECT_DIR$/data/conf/database.php" /> 127 <option value="$PROJECT_DIR$/data/conf/database.php" />
100 <option value="$PROJECT_DIR$/.gitlab-ci.yml" /> 128 <option value="$PROJECT_DIR$/.gitlab-ci.yml" />
  129 + <option value="$PROJECT_DIR$/app/admin/controller/AboutController.php" />
  130 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
  131 + <option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
  132 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
101 </list> 133 </list>
102 </option> 134 </option>
103 </component> 135 </component>
@@ -109,10 +141,10 @@ @@ -109,10 +141,10 @@
109 </component> 141 </component>
110 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 142 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
111 <component name="ProjectFrameBounds" extendedState="1"> 143 <component name="ProjectFrameBounds" extendedState="1">
112 - <option name="x" value="311" />  
113 - <option name="y" value="97" />  
114 - <option name="width" value="1512" />  
115 - <option name="height" value="1071" /> 144 + <option name="x" value="181" />
  145 + <option name="y" value="136" />
  146 + <option name="width" value="1678" />
  147 + <option name="height" value="1089" />
116 </component> 148 </component>
117 <component name="ProjectView"> 149 <component name="ProjectView">
118 <navigator currentView="ProjectPane" proportions="" version="1"> 150 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -139,13 +171,73 @@ @@ -139,13 +171,73 @@
139 <path> 171 <path>
140 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 172 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
141 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 173 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
142 - <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" /> 174 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
  175 + </path>
  176 + <path>
  177 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  178 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  179 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
  180 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  181 + </path>
  182 + <path>
  183 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  184 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  185 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
  186 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  187 + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
  188 + </path>
  189 + <path>
  190 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  191 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  192 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  193 + </path>
  194 + <path>
  195 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  196 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  197 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  198 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  199 + </path>
  200 + <path>
  201 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  202 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  203 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  204 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  205 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  206 + </path>
  207 + <path>
  208 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  209 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  210 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  211 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  212 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  213 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  214 + </path>
  215 + <path>
  216 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  217 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  218 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  219 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  220 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  221 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  222 + <item name="about" type="2a2b976b:PhpTreeStructureProvider$1" />
143 </path> 223 </path>
144 <path> 224 <path>
145 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 225 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
146 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 226 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
147 - <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />  
148 - <item name="conf" type="2a2b976b:PhpTreeStructureProvider$1" /> 227 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  228 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  229 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  230 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  231 + <item name="project" type="2a2b976b:PhpTreeStructureProvider$1" />
  232 + </path>
  233 + <path>
  234 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  235 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  236 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  237 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  238 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  239 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  240 + <item name="rtype" type="2a2b976b:PhpTreeStructureProvider$1" />
149 </path> 241 </path>
150 </expand> 242 </expand>
151 <select /> 243 <select />
@@ -180,6 +272,9 @@ @@ -180,6 +272,9 @@
180 <component name="ShelveChangesManager" show_recycled="false"> 272 <component name="ShelveChangesManager" show_recycled="false">
181 <option name="remove_strategy" value="false" /> 273 <option name="remove_strategy" value="false" />
182 </component> 274 </component>
  275 + <component name="SvnConfiguration">
  276 + <configuration />
  277 + </component>
183 <component name="TaskManager"> 278 <component name="TaskManager">
184 <task active="true" id="Default" summary="Default task"> 279 <task active="true" id="Default" summary="Default task">
185 <changelist id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="" /> 280 <changelist id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="" />
@@ -210,18 +305,18 @@ @@ -210,18 +305,18 @@
210 <workItem from="1573431784419" duration="6182000" /> 305 <workItem from="1573431784419" duration="6182000" />
211 <workItem from="1573448892997" duration="1343000" /> 306 <workItem from="1573448892997" duration="1343000" />
212 <workItem from="1573450754427" duration="9613000" /> 307 <workItem from="1573450754427" duration="9613000" />
213 - <workItem from="1573463816109" duration="687000" /> 308 + <workItem from="1573463816109" duration="4867000" />
214 </task> 309 </task>
215 <servers /> 310 <servers />
216 </component> 311 </component>
217 <component name="TimeTrackingManager"> 312 <component name="TimeTrackingManager">
218 - <option name="totallyTimeSpent" value="179663000" /> 313 + <option name="totallyTimeSpent" value="183843000" />
219 </component> 314 </component>
220 <component name="ToolWindowManager"> 315 <component name="ToolWindowManager">
221 - <frame x="311" y="97" width="1512" height="1071" extended-state="1" /> 316 + <frame x="181" y="136" width="1678" height="1089" extended-state="1" />
222 <editor active="true" /> 317 <editor active="true" />
223 <layout> 318 <layout>
224 - <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" /> 319 + <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" />
225 <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" /> 320 <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" />
226 <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" /> 321 <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" />
227 <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" /> 322 <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 @@ @@ -272,70 +367,6 @@
272 <watches-manager /> 367 <watches-manager />
273 </component> 368 </component>
274 <component name="editorHistoryManager"> 369 <component name="editorHistoryManager">
275 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/no_recycle/showgoods.html">  
276 - <provider selected="true" editor-type-id="text-editor">  
277 - <state relative-caret-position="275">  
278 - <caret line="11" column="37" lean-forward="false" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />  
279 - </state>  
280 - </provider>  
281 - </entry>  
282 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/no_recycle/edit.html">  
283 - <provider selected="true" editor-type-id="text-editor">  
284 - <state relative-caret-position="375">  
285 - <caret line="54" column="65" lean-forward="false" selection-start-line="54" selection-start-column="65" selection-end-line="54" selection-end-column="65" />  
286 - </state>  
287 - </provider>  
288 - </entry>  
289 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/no_recycle/editgoods.html">  
290 - <provider selected="true" editor-type-id="text-editor">  
291 - <state relative-caret-position="475">  
292 - <caret line="19" column="55" lean-forward="true" selection-start-line="19" selection-start-column="55" selection-end-line="19" selection-end-column="55" />  
293 - </state>  
294 - </provider>  
295 - </entry>  
296 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/recycle/addgoods.html">  
297 - <provider selected="true" editor-type-id="text-editor">  
298 - <state relative-caret-position="-325">  
299 - <caret line="14" column="32" lean-forward="true" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />  
300 - </state>  
301 - </provider>  
302 - </entry>  
303 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/no_recycle/addgoods.html">  
304 - <provider selected="true" editor-type-id="text-editor">  
305 - <state relative-caret-position="825">  
306 - <caret line="48" column="102" lean-forward="false" selection-start-line="48" selection-start-column="102" selection-end-line="48" selection-end-column="102" />  
307 - </state>  
308 - </provider>  
309 - </entry>  
310 - <entry file="file://$PROJECT_DIR$/app/admin/controller/NoRecycleController.php">  
311 - <provider selected="true" editor-type-id="text-editor">  
312 - <state relative-caret-position="518">  
313 - <caret line="147" column="70" lean-forward="false" selection-start-line="147" selection-start-column="70" selection-end-line="147" selection-end-column="70" />  
314 - </state>  
315 - </provider>  
316 - </entry>  
317 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rgoods/index.html">  
318 - <provider selected="true" editor-type-id="text-editor">  
319 - <state relative-caret-position="-28">  
320 - <caret line="13" column="4" lean-forward="true" selection-start-line="13" selection-start-column="4" selection-end-line="18" selection-end-column="11" />  
321 - </state>  
322 - </provider>  
323 - </entry>  
324 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shop_pic/index.html">  
325 - <provider selected="true" editor-type-id="text-editor">  
326 - <state relative-caret-position="-675">  
327 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
328 - </state>  
329 - </provider>  
330 - </entry>  
331 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html">  
332 - <provider selected="true" editor-type-id="text-editor">  
333 - <state relative-caret-position="260">  
334 - <caret line="40" column="38" lean-forward="true" selection-start-line="40" selection-start-column="38" selection-end-line="40" selection-end-column="38" />  
335 - </state>  
336 - </provider>  
337 - </entry>  
338 - <entry file="file://$PROJECT_DIR$/app/index/model/Recycle.php" />  
339 <entry file="file://$PROJECT_DIR$/app/index/controller/RecycleController.php"> 370 <entry file="file://$PROJECT_DIR$/app/index/controller/RecycleController.php">
340 <provider selected="true" editor-type-id="text-editor"> 371 <provider selected="true" editor-type-id="text-editor">
341 <state relative-caret-position="733"> 372 <state relative-caret-position="733">
@@ -354,6 +385,7 @@ @@ -354,6 +385,7 @@
354 <provider selected="true" editor-type-id="text-editor"> 385 <provider selected="true" editor-type-id="text-editor">
355 <state relative-caret-position="0"> 386 <state relative-caret-position="0">
356 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 387 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  388 + <folding />
357 </state> 389 </state>
358 </provider> 390 </provider>
359 </entry> 391 </entry>
@@ -389,6 +421,7 @@ @@ -389,6 +421,7 @@
389 <provider selected="true" editor-type-id="text-editor"> 421 <provider selected="true" editor-type-id="text-editor">
390 <state relative-caret-position="-1118"> 422 <state relative-caret-position="-1118">
391 <caret line="135" column="23" lean-forward="false" selection-start-line="135" selection-start-column="23" selection-end-line="135" selection-end-column="23" /> 423 <caret line="135" column="23" lean-forward="false" selection-start-line="135" selection-start-column="23" selection-end-line="135" selection-end-column="23" />
  424 + <folding />
392 </state> 425 </state>
393 </provider> 426 </provider>
394 </entry> 427 </entry>
@@ -504,17 +537,14 @@ @@ -504,17 +537,14 @@
504 </state> 537 </state>
505 </provider> 538 </provider>
506 </entry> 539 </entry>
507 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/index.html">  
508 - <provider selected="true" editor-type-id="text-editor">  
509 - <state relative-caret-position="150">  
510 - <caret line="6" column="8" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="61" selection-end-column="7" />  
511 - </state>  
512 - </provider>  
513 - </entry>  
514 <entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php"> 540 <entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">
515 <provider selected="true" editor-type-id="text-editor"> 541 <provider selected="true" editor-type-id="text-editor">
516 <state relative-caret-position="456"> 542 <state relative-caret-position="456">
517 <caret line="92" column="15" lean-forward="true" selection-start-line="92" selection-start-column="15" selection-end-line="92" selection-end-column="15" /> 543 <caret line="92" column="15" lean-forward="true" selection-start-line="92" selection-start-column="15" selection-end-line="92" selection-end-column="15" />
  544 + <folding>
  545 + <element signature="e#266#1001#0#PHP" expanded="false" />
  546 + <element signature="e#3943#4413#0#PHP" expanded="false" />
  547 + </folding>
518 </state> 548 </state>
519 </provider> 549 </provider>
520 </entry> 550 </entry>
@@ -525,20 +555,6 @@ @@ -525,20 +555,6 @@
525 </state> 555 </state>
526 </provider> 556 </provider>
527 </entry> 557 </entry>
528 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html">  
529 - <provider selected="true" editor-type-id="text-editor">  
530 - <state relative-caret-position="350">  
531 - <caret line="20" column="78" lean-forward="true" selection-start-line="20" selection-start-column="78" selection-end-line="20" selection-end-column="78" />  
532 - </state>  
533 - </provider>  
534 - </entry>  
535 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html">  
536 - <provider selected="true" editor-type-id="text-editor">  
537 - <state relative-caret-position="381">  
538 - <caret line="59" column="21" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="181" selection-end-column="0" />  
539 - </state>  
540 - </provider>  
541 - </entry>  
542 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/index.html"> 558 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/index.html">
543 <provider selected="true" editor-type-id="text-editor"> 559 <provider selected="true" editor-type-id="text-editor">
544 <state relative-caret-position="625"> 560 <state relative-caret-position="625">
@@ -564,20 +580,13 @@ @@ -564,20 +580,13 @@
564 <provider selected="true" editor-type-id="text-editor"> 580 <provider selected="true" editor-type-id="text-editor">
565 <state relative-caret-position="375"> 581 <state relative-caret-position="375">
566 <caret line="73" column="5" lean-forward="true" selection-start-line="73" selection-start-column="5" selection-end-line="73" selection-end-column="5" /> 582 <caret line="73" column="5" lean-forward="true" selection-start-line="73" selection-start-column="5" selection-end-line="73" selection-end-column="5" />
567 - </state>  
568 - </provider>  
569 - </entry>  
570 - <entry file="file://$PROJECT_DIR$/app/admin/controller/AboutController.php">  
571 - <provider selected="true" editor-type-id="text-editor">  
572 - <state relative-caret-position="300">  
573 - <caret line="17" column="4" lean-forward="false" selection-start-line="17" selection-start-column="4" selection-end-line="45" selection-end-column="5" />  
574 - </state>  
575 - </provider>  
576 - </entry>  
577 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/about/index.html">  
578 - <provider selected="true" editor-type-id="text-editor">  
579 - <state relative-caret-position="150">  
580 - <caret line="33" column="52" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="129" selection-end-column="0" /> 583 + <folding>
  584 + <element signature="e#131#170#0#PHP" expanded="true" />
  585 + <element signature="e#262#867#0#PHP" expanded="false" />
  586 + <element signature="e#882#2069#0#PHP" expanded="false" />
  587 + <element signature="e#2084#3731#0#PHP" expanded="false" />
  588 + <element signature="e#3746#4212#0#PHP" expanded="false" />
  589 + </folding>
581 </state> 590 </state>
582 </provider> 591 </provider>
583 </entry> 592 </entry>
@@ -602,13 +611,6 @@ @@ -602,13 +611,6 @@
602 </state> 611 </state>
603 </provider> 612 </provider>
604 </entry> 613 </entry>
605 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">  
606 - <provider selected="true" editor-type-id="text-editor">  
607 - <state relative-caret-position="350">  
608 - <caret line="47" column="0" lean-forward="true" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />  
609 - </state>  
610 - </provider>  
611 - </entry>  
612 <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml"> 614 <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
613 <provider selected="true" editor-type-id="text-editor"> 615 <provider selected="true" editor-type-id="text-editor">
614 <state relative-caret-position="200"> 616 <state relative-caret-position="200">
@@ -625,5 +627,143 @@ @@ -625,5 +627,143 @@
625 </state> 627 </state>
626 </provider> 628 </provider>
627 </entry> 629 </entry>
  630 + <entry file="file://$PROJECT_DIR$/app/admin/controller/AboutController.php">
  631 + <provider selected="true" editor-type-id="text-editor">
  632 + <state relative-caret-position="370">
  633 + <caret line="25" column="32" lean-forward="true" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
  634 + <folding>
  635 + <element signature="e#131#170#0#PHP" expanded="true" />
  636 + </folding>
  637 + </state>
  638 + </provider>
  639 + </entry>
  640 + <entry file="file://$PROJECT_DIR$/app/admin/controller/RgoodsController.php">
  641 + <provider selected="true" editor-type-id="text-editor">
  642 + <state relative-caret-position="97">
  643 + <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
  644 + <folding>
  645 + <element signature="e#263#998#0#PHP" expanded="false" />
  646 + </folding>
  647 + </state>
  648 + </provider>
  649 + </entry>
  650 + <entry file="file://$PROJECT_DIR$/app/admin/controller/RecycleController.php">
  651 + <provider selected="true" editor-type-id="text-editor">
  652 + <state relative-caret-position="0">
  653 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  654 + <folding />
  655 + </state>
  656 + </provider>
  657 + </entry>
  658 + <entry file="file://$PROJECT_DIR$/app/admin/controller/RtypeController.php">
  659 + <provider selected="true" editor-type-id="text-editor">
  660 + <state relative-caret-position="0">
  661 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  662 + <folding />
  663 + </state>
  664 + </provider>
  665 + </entry>
  666 + <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
  667 + <provider selected="true" editor-type-id="text-editor">
  668 + <state relative-caret-position="0">
  669 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  670 + <folding />
  671 + </state>
  672 + </provider>
  673 + </entry>
  674 + <entry file="file://$PROJECT_DIR$/app/admin/controller/HomePicController.php">
  675 + <provider selected="true" editor-type-id="text-editor">
  676 + <state relative-caret-position="0">
  677 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  678 + <folding />
  679 + </state>
  680 + </provider>
  681 + </entry>
  682 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
  683 + <provider selected="true" editor-type-id="text-editor">
  684 + <state relative-caret-position="400">
  685 + <caret line="41" column="8" lean-forward="false" selection-start-line="41" selection-start-column="8" selection-end-line="42" selection-end-column="87" />
  686 + <folding />
  687 + </state>
  688 + </provider>
  689 + </entry>
  690 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/index.html">
  691 + <provider selected="true" editor-type-id="text-editor">
  692 + <state relative-caret-position="150">
  693 + <caret line="6" column="8" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="61" selection-end-column="7" />
  694 + <folding />
  695 + </state>
  696 + </provider>
  697 + </entry>
  698 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html">
  699 + <provider selected="true" editor-type-id="text-editor">
  700 + <state relative-caret-position="1131">
  701 + <caret line="59" column="21" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="181" selection-end-column="0" />
  702 + <folding />
  703 + </state>
  704 + </provider>
  705 + </entry>
  706 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
  707 + <provider selected="true" editor-type-id="text-editor">
  708 + <state relative-caret-position="500">
  709 + <caret line="29" column="28" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="70" selection-end-column="7" />
  710 + <folding />
  711 + </state>
  712 + </provider>
  713 + </entry>
  714 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">
  715 + <provider selected="true" editor-type-id="text-editor">
  716 + <state relative-caret-position="302">
  717 + <caret line="37" column="20" lean-forward="true" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
  718 + <folding />
  719 + </state>
  720 + </provider>
  721 + </entry>
  722 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html">
  723 + <provider selected="true" editor-type-id="text-editor">
  724 + <state relative-caret-position="275">
  725 + <caret line="20" column="78" lean-forward="true" selection-start-line="20" selection-start-column="78" selection-end-line="20" selection-end-column="78" />
  726 + <folding />
  727 + </state>
  728 + </provider>
  729 + </entry>
  730 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rtype/edit.html">
  731 + <provider selected="true" editor-type-id="text-editor">
  732 + <state relative-caret-position="400">
  733 + <caret line="37" column="11" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
  734 + <folding />
  735 + </state>
  736 + </provider>
  737 + </entry>
  738 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/about/index.html">
  739 + <provider selected="true" editor-type-id="text-editor">
  740 + <state relative-caret-position="538">
  741 + <caret line="52" column="20" lean-forward="false" selection-start-line="52" selection-start-column="20" selection-end-line="57" selection-end-column="25" />
  742 + <folding />
  743 + </state>
  744 + </provider>
  745 + </entry>
  746 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">
  747 + <provider selected="true" editor-type-id="text-editor">
  748 + <state relative-caret-position="627">
  749 + <caret line="41" column="17" lean-forward="true" selection-start-line="41" selection-start-column="17" selection-end-line="41" selection-end-column="17" />
  750 + <folding />
  751 + </state>
  752 + </provider>
  753 + </entry>
  754 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
  755 + <provider selected="true" editor-type-id="text-editor">
  756 + <state relative-caret-position="550">
  757 + <caret line="111" column="28" lean-forward="false" selection-start-line="111" selection-start-column="28" selection-end-line="111" selection-end-column="28" />
  758 + <folding>
  759 + <element signature="e#131#170#0#PHP" expanded="true" />
  760 + <element signature="e#275#1168#0#PHP" expanded="false" />
  761 + <element signature="e#1185#2077#0#PHP" expanded="false" />
  762 + <element signature="e#2098#3253#0#PHP" expanded="false" />
  763 + <element signature="e#3274#3743#0#PHP" expanded="false" />
  764 + </folding>
  765 + </state>
  766 + </provider>
  767 + </entry>
628 </component> 768 </component>
629 </project> 769 </project>
@@ -76,4 +76,49 @@ class ProjectController extends AdminBaseController @@ -76,4 +76,49 @@ class ProjectController extends AdminBaseController
76 return $this->fetch(); 76 return $this->fetch();
77 } 77 }
78 } 78 }
  79 +
  80 + //加入我们信息列表
  81 + public function addlist()
  82 + {
  83 + $where['delete_time'] = ['eq',0];
  84 + $param = $this->request->param();
  85 + $startTime = empty($param['start_time']) ? '' : strtotime($param['start_time']);
  86 + $endTime = empty($param['end_time']) ? '' : (strtotime($param['end_time']));
  87 + if (!empty($startTime) && !empty($endTime)) {
  88 + $where['create_time'] = [['>= time', $startTime], ['<= time', $endTime]];
  89 + } else {
  90 + if (!empty($startTime)) {
  91 + $where['create_time'] = ['>= time', $startTime];
  92 + }
  93 + if (!empty($endTime)) {
  94 + $where['create_time'] = ['<= time', $endTime];
  95 + }
  96 + }
  97 + $data = Db::name('join')
  98 + ->where($where)
  99 + ->order('id desc')
  100 + ->paginate(10);
  101 + $list=$data->items();
  102 + $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
  103 + $this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : '');
  104 + $this->assign([
  105 + 'data'=>$list,
  106 + 'page'=>$data->render(),
  107 + ]);
  108 + return $this->fetch();
  109 + }
  110 +
  111 + //加入我们信息详情
  112 + public function detail()
  113 + {
  114 + $param = $this->request->param();
  115 + $id = $this->request->param('id', 1, 'intval');
  116 + $data = Db::name('join')
  117 + ->where('id',$id)
  118 + ->find();
  119 + $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
  120 + $this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : '');
  121 + $this->assign('data',$data);
  122 + return $this->fetch();
  123 + }
79 } 124 }
@@ -55,6 +55,7 @@ return array ( @@ -55,6 +55,7 @@ return array (
55 'ADMIN_PLUGIN_UNINSTALL' => '卸载插件', 55 'ADMIN_PLUGIN_UNINSTALL' => '卸载插件',
56 'ADMIN_PLUGIN_UPDATE' => '插件更新', 56 'ADMIN_PLUGIN_UPDATE' => '插件更新',
57 'ADMIN_POINT_INDEX' => '回收站列表', 57 'ADMIN_POINT_INDEX' => '回收站列表',
  58 + 'ADMIN_PROJECT_ADDLIST' => '加入我们信息列表',
58 'ADMIN_PROJECT_INDEX' => '产品方案', 59 'ADMIN_PROJECT_INDEX' => '产品方案',
59 'ADMIN_PROJECT_SELECT' => '加入我们', 60 'ADMIN_PROJECT_SELECT' => '加入我们',
60 'ADMIN_RBAC_AUTHORIZE' => '设置角色权限', 61 'ADMIN_RBAC_AUTHORIZE' => '设置角色权限',
  1 +<include file="public@header" />
  2 +</head>
  3 +<style>
  4 + th,td{
  5 + text-align: center;
  6 + }
  7 +</style>
  8 +<body>
  9 +<div class="wrap js-check-wrap">
  10 + <ul class="nav nav-tabs">
  11 + <li class="active"><a href="{:url('project/addlist')}">商品订单列表</a></li>
  12 + </ul>
  13 + <form class="well form-inline margin-top-20" method="post" action="{:url('project/addlist')}">
  14 + 时间:
  15 + <input type="text" class="form-control js-bootstrap-date" name="start_time"
  16 + value="{$start_time|default=''}"
  17 + style="width: 140px;" autocomplete="off">-
  18 + <input type="text" class="form-control js-bootstrap-date" name="end_time"
  19 + value="{$end_time|default=''}"
  20 + style="width: 140px;" autocomplete="off"> &nbsp; &nbsp;
  21 + <input type="submit" class="btn btn-primary" value="搜索" />
  22 + <a class="btn btn-danger" href="{:url('project/addlist')}">清空</a>
  23 + </form>
  24 + <form class="js-ajax-form" action="" method="post">
  25 + <table class="table table-hover table-bordered">
  26 + <thead>
  27 + <tr>
  28 + <th>ID</th>
  29 + <th>姓名</th>
  30 + <th>电话</th>
  31 + <th>邮箱</th>
  32 + <th>创建时间</th>
  33 + <th>操作</th>
  34 + </tr>
  35 + </thead>
  36 + <tbody>
  37 + <foreach name="data" item="vo">
  38 + <tr>
  39 + <td>{$vo.id}</td>
  40 + <td>{$vo.name}</td>
  41 + <td>{$vo.phone}</td>
  42 + <td>{$vo.email}</td>
  43 + <td>{:date('Y-m-d H:i:s',$vo.create_time)}</td>
  44 + <td>
  45 + <a href='{:url("project/detail",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>|
  46 + </td>
  47 + </tr>
  48 + </foreach>
  49 + </tbody>
  50 + </table>
  51 + <div class="pagination">{$page}</div>
  52 + </form>
  53 +</div>
  54 +<script src="__STATIC__/js/admin.js"></script>
  55 +</body>
  56 +</html>
  1 +<include file="public@header"/>
  2 +</head>
  3 +<body>
  4 +<!--<script type="text/html" id="photos-item-tpl">-->
  5 +<!--<li id="saved-image{id}">-->
  6 +<!--<input id="photo-{id}" type="hidden" name="photo_urls[]" value="{filepath}">-->
  7 +<!--<input class="form-control" id="photo-{id}-name" type="text" name="photo_names[]" value="{name}"-->
  8 +<!--style="width: 200px;" title="图片名称">-->
  9 +<!--<img id="photo-{id}-preview" src="{url}" style="height:36px;width: 36px;"-->
  10 +<!--onclick="imagePreviewDialog(this.src);">-->
  11 +<!--<a href="javascript:uploadOneImage('图片上传','#photo-{id}');">替换</a>-->
  12 +<!--<a href="javascript:(function(){$('#saved-image{id}').remove();})();">移除</a>-->
  13 +<!--</li>-->
  14 +<!--</script>-->
  15 +<div class="wrap js-check-wrap">
  16 + <ul class="nav nav-tabs">
  17 + <li><a href="{:url('project/addlist')}">加入我们信息列表</a></li>
  18 + <li class="active"><a href="#">查看详情</a></li>
  19 + </ul>
  20 + <form action="{:url('rtype/edit')}" method="post" class="form-horizontal js-ajax-form margin-top-20">
  21 + <table class="table table-bordered">
  22 + <tr>
  23 + <th width="100">姓名</th>
  24 + <td>
  25 + <input class="form-control" type="text" name="name"
  26 + id="name" value="{$data.name}" placeholder="请输入分类名称"/>
  27 + </td>
  28 + </tr>
  29 + <tr>
  30 + <th width="100">电话</th>
  31 + <td>
  32 + <input class="form-control" type="text" name="phone"
  33 + id="phone" value="{$data.phone}" placeholder="请输入联系方式"/>
  34 + </td>
  35 + </tr>
  36 + <tr>
  37 + <th width="100">邮箱</th>
  38 + <td>
  39 + <input class="form-control" type="text" name="email"
  40 + id="email" value="{$data.email}" placeholder="请输入邮箱"/>
  41 + </td>
  42 + </tr>
  43 + <tr>
  44 + <th width="100">加盟信息</th>
  45 + <td>
  46 + <script type="text/plain" id="content" name="content">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.content))}</script>
  47 + </td>
  48 + </tr>
  49 + </table>
  50 + <div class="form-group">
  51 + <div class="col-sm-offset-2 col-sm-10">
  52 + <a class="btn btn-default" href="{:url('project/addlist',array('start_time'=>$start_time,'end_time=>$end_time'))}">{:lang('BACK')}</a>
  53 + </div>
  54 + </div>
  55 + </form>
  56 +</div>
  57 +<script type="text/javascript" src="__STATIC__/js/admin.js"></script>
  58 +<script type="text/javascript">
  59 + //编辑器路径定义
  60 + var editorURL = GV.WEB_ROOT;
  61 +</script>
  62 +<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.config.js"></script>
  63 +<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.all.min.js"></script>
  64 +<script type="text/javascript">
  65 + $(function () {
  66 +
  67 + editorcontent = new baidu.editor.ui.Editor();
  68 + editorcontent.render('content');
  69 + try {
  70 + editorcontent.sync();
  71 + } catch (err) {
  72 + }
  73 +
  74 + $('.btn-cancel-thumbnail').click(function () {
  75 + $('#thumbnail-preview').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
  76 + $('#thumbnail').val('');
  77 + });
  78 +
  79 + $('.btn-cancel-thumbnail1').click(function () {
  80 + $('#thumbnail-preview1').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
  81 + $('#thumbnail1').val('');
  82 + });
  83 +
  84 +
  85 + });
  86 +</script>
  87 +</body>
  88 +</html>