王晓刚 / adverh5 · 提交

转到一个项目

作者 王晓刚
提交 25983a00361dd772064d6bc7c6de6b6e12d0a63c 1 个父辈 00c3eff9

小修改

内嵌 并排对比
正在显示 6 个修改的文件 包含 233 行增加 和 109 行删除
@@ -2,30 +2,12 @@ @@ -2,30 +2,12 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment=""> 4 <list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment="">
5 - <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />  
7 - <change afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" />  
8 - <change afterPath="$PROJECT_DIR$/application/home/view/index/login.html" afterDir="false" />  
9 - <change afterPath="$PROJECT_DIR$/public/.gitignore" afterDir="false" />  
10 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/css/index.css" afterDir="false" />  
11 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/css/login.css" afterDir="false" />  
12 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/css/public.css" afterDir="false" />  
13 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/1.png" afterDir="false" />  
14 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/10.png" afterDir="false" />  
15 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/2.png" afterDir="false" />  
16 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/3.png" afterDir="false" />  
17 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/4.png" afterDir="false" />  
18 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/5.png" afterDir="false" />  
19 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/6.png" afterDir="false" />  
20 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/7.png" afterDir="false" />  
21 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/8.png" afterDir="false" />  
22 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/9.png" afterDir="false" />  
23 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/bg1.png" afterDir="false" />  
24 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/bg2.png" afterDir="false" />  
25 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/image.png" afterDir="false" />  
26 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/js/base.js" afterDir="false" />  
27 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/js/jquery.min.js" afterDir="false" />  
28 - <change afterPath="$PROJECT_DIR$/public/assets/adverh5/js/public.js" afterDir="false" /> 5 + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/application/admin/view/goods/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods/add.html" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/application/admin/view/goods/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods/edit.html" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/application/home/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/application/home/view/index/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/login.html" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/public/assets/js/backend/goods.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/goods.js" afterDir="false" />
29 </list> 11 </list>
30 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
31 <option name="TRACKING_ENABLED" value="true" /> 13 <option name="TRACKING_ENABLED" value="true" />
@@ -34,16 +16,16 @@ @@ -34,16 +16,16 @@
34 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 16 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
35 <option name="LAST_RESOLUTION" value="IGNORE" /> 17 <option name="LAST_RESOLUTION" value="IGNORE" />
36 </component> 18 </component>
37 - <component name="ComposerSettings" synchronizationState="SYNCHRONIZE"> 19 + <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
38 <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath> 20 <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
39 </component> 21 </component>
40 <component name="FileEditorManager"> 22 <component name="FileEditorManager">
41 - <leaf> 23 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
42 <file leaf-file-name="Index.php" pinned="false" current-in-tab="true"> 24 <file leaf-file-name="Index.php" pinned="false" current-in-tab="true">
43 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 25 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
44 <provider selected="true" editor-type-id="text-editor"> 26 <provider selected="true" editor-type-id="text-editor">
45 <state relative-caret-position="442"> 27 <state relative-caret-position="442">
46 - <caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" /> 28 + <caret line="31" column="33" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
47 <folding> 29 <folding>
48 <element signature="e#128#163#0#PHP" expanded="true" /> 30 <element signature="e#128#163#0#PHP" expanded="true" />
49 </folding> 31 </folding>
@@ -51,11 +33,11 @@ @@ -51,11 +33,11 @@
51 </provider> 33 </provider>
52 </entry> 34 </entry>
53 </file> 35 </file>
54 - <file leaf-file-name="config.php" pinned="false" current-in-tab="false">  
55 - <entry file="file://$PROJECT_DIR$/application/config.php"> 36 + <file leaf-file-name="helper.php" pinned="false" current-in-tab="false">
  37 + <entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
56 <provider selected="true" editor-type-id="text-editor"> 38 <provider selected="true" editor-type-id="text-editor">
57 - <state relative-caret-position="477">  
58 - <caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" /> 39 + <state relative-caret-position="289">
  40 + <caret line="279" column="13" selection-start-line="279" selection-start-column="13" selection-end-line="279" selection-end-column="13" />
59 </state> 41 </state>
60 </provider> 42 </provider>
61 </entry> 43 </entry>
@@ -63,17 +45,8 @@ @@ -63,17 +45,8 @@
63 <file leaf-file-name="login.html" pinned="false" current-in-tab="false"> 45 <file leaf-file-name="login.html" pinned="false" current-in-tab="false">
64 <entry file="file://$PROJECT_DIR$/application/home/view/index/login.html"> 46 <entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
65 <provider selected="true" editor-type-id="text-editor"> 47 <provider selected="true" editor-type-id="text-editor">
66 - <state relative-caret-position="487">  
67 - <caret line="75" column="32" selection-start-line="75" selection-start-column="32" selection-end-line="75" selection-end-column="32" />  
68 - </state>  
69 - </provider>  
70 - </entry>  
71 - </file>  
72 - <file leaf-file-name="public.js" pinned="false" current-in-tab="false">  
73 - <entry file="file://$PROJECT_DIR$/public/assets/adverh5/js/public.js">  
74 - <provider selected="true" editor-type-id="text-editor">  
75 - <state relative-caret-position="102">  
76 - <caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" /> 48 + <state relative-caret-position="470">
  49 + <caret line="74" column="116" selection-start-line="74" selection-start-column="116" selection-end-line="74" selection-end-column="116" />
77 </state> 50 </state>
78 </provider> 51 </provider>
79 </entry> 52 </entry>
@@ -90,7 +63,7 @@ @@ -90,7 +63,7 @@
90 <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> 63 <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
91 <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> 64 <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
92 <provider selected="true" editor-type-id="text-editor"> 65 <provider selected="true" editor-type-id="text-editor">
93 - <state relative-caret-position="2210"> 66 + <state relative-caret-position="810">
94 <caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" /> 67 <caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" />
95 <folding> 68 <folding>
96 <element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 69 <element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -99,15 +72,6 @@ @@ -99,15 +72,6 @@
99 </provider> 72 </provider>
100 </entry> 73 </entry>
101 </file> 74 </file>
102 - <file leaf-file-name="index.css" pinned="false" current-in-tab="false">  
103 - <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css">  
104 - <provider selected="true" editor-type-id="text-editor">  
105 - <state relative-caret-position="679">  
106 - <caret line="116" column="22" selection-start-line="116" selection-start-column="22" selection-end-line="116" selection-end-column="22" />  
107 - </state>  
108 - </provider>  
109 - </entry>  
110 - </file>  
111 </leaf> 75 </leaf>
112 </component> 76 </component>
113 <component name="FileTemplateManagerImpl"> 77 <component name="FileTemplateManagerImpl">
@@ -139,8 +103,6 @@ @@ -139,8 +103,6 @@
139 <option value="$PROJECT_DIR$/public/assets/adverh5/css/public.css" /> 103 <option value="$PROJECT_DIR$/public/assets/adverh5/css/public.css" />
140 <option value="$PROJECT_DIR$/application/admin/view/password/index.html" /> 104 <option value="$PROJECT_DIR$/application/admin/view/password/index.html" />
141 <option value="$PROJECT_DIR$/public/assets/js/backend/password.js" /> 105 <option value="$PROJECT_DIR$/public/assets/js/backend/password.js" />
142 - <option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" />  
143 - <option value="$PROJECT_DIR$/application/admin/view/goods/index.html" />  
144 <option value="$PROJECT_DIR$/application/admin/view/dashboard/index.html" /> 106 <option value="$PROJECT_DIR$/application/admin/view/dashboard/index.html" />
145 <option value="$PROJECT_DIR$/application/admin/view/index/login.html" /> 107 <option value="$PROJECT_DIR$/application/admin/view/index/login.html" />
146 <option value="$PROJECT_DIR$/application/admin/view/index/index.html" /> 108 <option value="$PROJECT_DIR$/application/admin/view/index/index.html" />
@@ -149,11 +111,15 @@ @@ -149,11 +111,15 @@
149 <option value="$PROJECT_DIR$/application/extra/site.php" /> 111 <option value="$PROJECT_DIR$/application/extra/site.php" />
150 <option value="$PROJECT_DIR$/public/assets/adverh5/js/public.js" /> 112 <option value="$PROJECT_DIR$/public/assets/adverh5/js/public.js" />
151 <option value="$PROJECT_DIR$/public/assets/adverh5/css/login.css" /> 113 <option value="$PROJECT_DIR$/public/assets/adverh5/css/login.css" />
152 - <option value="$PROJECT_DIR$/application/home/view/index/login.html" />  
153 - <option value="$PROJECT_DIR$/application/home/controller/Index.php" />  
154 <option value="$PROJECT_DIR$/application/home/view/index/index.html" /> 114 <option value="$PROJECT_DIR$/application/home/view/index/index.html" />
155 <option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" /> 115 <option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
156 <option value="$PROJECT_DIR$/application/config.php" /> 116 <option value="$PROJECT_DIR$/application/config.php" />
  117 + <option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
  118 + <option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
  119 + <option value="$PROJECT_DIR$/application/admin/view/goods/index.html" />
  120 + <option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" />
  121 + <option value="$PROJECT_DIR$/application/home/view/index/login.html" />
  122 + <option value="$PROJECT_DIR$/application/home/controller/Index.php" />
157 </list> 123 </list>
158 </option> 124 </option>
159 </component> 125 </component>
@@ -242,6 +208,41 @@ @@ -242,6 +208,41 @@
242 <item name="adverh5" type="b2602c69:ProjectViewProjectNode" /> 208 <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
243 <item name="adverh5" type="462c0819:PsiDirectoryNode" /> 209 <item name="adverh5" type="462c0819:PsiDirectoryNode" />
244 <item name="application" type="462c0819:PsiDirectoryNode" /> 210 <item name="application" type="462c0819:PsiDirectoryNode" />
  211 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  212 + </path>
  213 + <path>
  214 + <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
  215 + <item name="adverh5" type="462c0819:PsiDirectoryNode" />
  216 + <item name="application" type="462c0819:PsiDirectoryNode" />
  217 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  218 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  219 + </path>
  220 + <path>
  221 + <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
  222 + <item name="adverh5" type="462c0819:PsiDirectoryNode" />
  223 + <item name="application" type="462c0819:PsiDirectoryNode" />
  224 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  225 + <item name="validate" type="462c0819:PsiDirectoryNode" />
  226 + </path>
  227 + <path>
  228 + <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
  229 + <item name="adverh5" type="462c0819:PsiDirectoryNode" />
  230 + <item name="application" type="462c0819:PsiDirectoryNode" />
  231 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  232 + <item name="view" type="462c0819:PsiDirectoryNode" />
  233 + </path>
  234 + <path>
  235 + <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
  236 + <item name="adverh5" type="462c0819:PsiDirectoryNode" />
  237 + <item name="application" type="462c0819:PsiDirectoryNode" />
  238 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  239 + <item name="view" type="462c0819:PsiDirectoryNode" />
  240 + <item name="goods" type="462c0819:PsiDirectoryNode" />
  241 + </path>
  242 + <path>
  243 + <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
  244 + <item name="adverh5" type="462c0819:PsiDirectoryNode" />
  245 + <item name="application" type="462c0819:PsiDirectoryNode" />
245 <item name="extra" type="462c0819:PsiDirectoryNode" /> 246 <item name="extra" type="462c0819:PsiDirectoryNode" />
246 </path> 247 </path>
247 <path> 248 <path>
@@ -270,6 +271,21 @@ @@ -270,6 +271,21 @@
270 <item name="adverh5" type="462c0819:PsiDirectoryNode" /> 271 <item name="adverh5" type="462c0819:PsiDirectoryNode" />
271 <item name="js" type="462c0819:PsiDirectoryNode" /> 272 <item name="js" type="462c0819:PsiDirectoryNode" />
272 </path> 273 </path>
  274 + <path>
  275 + <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
  276 + <item name="adverh5" type="462c0819:PsiDirectoryNode" />
  277 + <item name="public" type="462c0819:PsiDirectoryNode" />
  278 + <item name="assets" type="462c0819:PsiDirectoryNode" />
  279 + <item name="js" type="462c0819:PsiDirectoryNode" />
  280 + </path>
  281 + <path>
  282 + <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
  283 + <item name="adverh5" type="462c0819:PsiDirectoryNode" />
  284 + <item name="public" type="462c0819:PsiDirectoryNode" />
  285 + <item name="assets" type="462c0819:PsiDirectoryNode" />
  286 + <item name="js" type="462c0819:PsiDirectoryNode" />
  287 + <item name="backend" type="462c0819:PsiDirectoryNode" />
  288 + </path>
273 </expand> 289 </expand>
274 <select /> 290 <select />
275 </subPane> 291 </subPane>
@@ -322,38 +338,39 @@ @@ -322,38 +338,39 @@
322 <option name="presentableId" value="Default" /> 338 <option name="presentableId" value="Default" />
323 <updated>1571368480027</updated> 339 <updated>1571368480027</updated>
324 <workItem from="1571368481262" duration="23015000" /> 340 <workItem from="1571368481262" duration="23015000" />
  341 + <workItem from="1571618159935" duration="2519000" />
325 </task> 342 </task>
326 <servers /> 343 <servers />
327 </component> 344 </component>
328 <component name="TimeTrackingManager"> 345 <component name="TimeTrackingManager">
329 - <option name="totallyTimeSpent" value="23015000" /> 346 + <option name="totallyTimeSpent" value="25534000" />
330 </component> 347 </component>
331 <component name="ToolWindowManager"> 348 <component name="ToolWindowManager">
332 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 349 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
333 <editor active="true" /> 350 <editor active="true" />
334 <layout> 351 <layout>
  352 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14818764" />
335 <window_info anchor="bottom" id="TODO" order="6" /> 353 <window_info anchor="bottom" id="TODO" order="6" />
336 - <window_info anchor="bottom" id="调试" />  
337 - <window_info anchor="bottom" id="Event Log" side_tool="true" />  
338 - <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />  
339 - <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />  
340 - <window_info anchor="bottom" id="运行" />  
341 - <window_info anchor="bottom" id="Terminal" />  
342 - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />  
343 - <window_info anchor="bottom" id="Docker" show_stripe_button="false" />  
344 - <window_info anchor="right" id="Database" /> 354 + <window_info anchor="bottom" id="调试" order="7" />
  355 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  356 + <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
  357 + <window_info anchor="right" id="Database" order="3" />
  358 + <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
  359 + <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
345 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 360 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
346 - <window_info id="Favorites" side_tool="true" />  
347 - <window_info anchor="bottom" id="找到" />  
348 - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />  
349 - <window_info anchor="bottom" id="Find" order="1" />  
350 - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 361 + <window_info anchor="bottom" id="Terminal" order="7" />
  362 + <window_info anchor="bottom" id="运行" order="7" />
  363 + <window_info id="Favorites" order="2" side_tool="true" />
  364 + <window_info anchor="bottom" id="找到" order="7" />
351 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 365 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
352 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> 366 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  367 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
353 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 368 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
354 <window_info anchor="bottom" id="Run" order="2" /> 369 <window_info anchor="bottom" id="Run" order="2" />
  370 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
355 <window_info anchor="bottom" id="Message" order="0" /> 371 <window_info anchor="bottom" id="Message" order="0" />
356 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> 372 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  373 + <window_info anchor="bottom" id="Find" order="1" />
357 </layout> 374 </layout>
358 </component> 375 </component>
359 <component name="TypeScriptGeneratedFilesManager"> 376 <component name="TypeScriptGeneratedFilesManager">
@@ -363,6 +380,61 @@ @@ -363,6 +380,61 @@
363 <option name="myLimit" value="2678400000" /> 380 <option name="myLimit" value="2678400000" />
364 </component> 381 </component>
365 <component name="editorHistoryManager"> 382 <component name="editorHistoryManager">
  383 + <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
  384 + <provider selected="true" editor-type-id="text-editor">
  385 + <state relative-caret-position="408">
  386 + <caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
  387 + <folding>
  388 + <element signature="e#128#163#0#PHP" expanded="true" />
  389 + </folding>
  390 + </state>
  391 + </provider>
  392 + </entry>
  393 + <entry file="file://$PROJECT_DIR$/application/config.php">
  394 + <provider selected="true" editor-type-id="text-editor">
  395 + <state relative-caret-position="935">
  396 + <caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" />
  397 + </state>
  398 + </provider>
  399 + </entry>
  400 + <entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
  401 + <provider selected="true" editor-type-id="text-editor">
  402 + <state relative-caret-position="1275">
  403 + <caret line="75" column="32" selection-start-line="75" selection-start-column="32" selection-end-line="75" selection-end-column="32" />
  404 + </state>
  405 + </provider>
  406 + </entry>
  407 + <entry file="file://$PROJECT_DIR$/public/assets/adverh5/js/public.js">
  408 + <provider selected="true" editor-type-id="text-editor">
  409 + <state relative-caret-position="102">
  410 + <caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
  411 + </state>
  412 + </provider>
  413 + </entry>
  414 + <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
  415 + <provider selected="true" editor-type-id="text-editor">
  416 + <state relative-caret-position="289">
  417 + <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="19" selection-end-column="24" />
  418 + </state>
  419 + </provider>
  420 + </entry>
  421 + <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
  422 + <provider selected="true" editor-type-id="text-editor">
  423 + <state relative-caret-position="2210">
  424 + <caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" />
  425 + <folding>
  426 + <element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  427 + </folding>
  428 + </state>
  429 + </provider>
  430 + </entry>
  431 + <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css">
  432 + <provider selected="true" editor-type-id="text-editor">
  433 + <state relative-caret-position="1972">
  434 + <caret line="116" column="22" selection-start-line="116" selection-start-column="22" selection-end-line="116" selection-end-column="22" />
  435 + </state>
  436 + </provider>
  437 + </entry>
366 <entry file="file://$PROJECT_DIR$/.gitignore"> 438 <entry file="file://$PROJECT_DIR$/.gitignore">
367 <provider selected="true" editor-type-id="text-editor" /> 439 <provider selected="true" editor-type-id="text-editor" />
368 </entry> 440 </entry>
@@ -413,20 +485,6 @@ @@ -413,20 +485,6 @@
413 </state> 485 </state>
414 </provider> 486 </provider>
415 </entry> 487 </entry>
416 - <entry file="file://$PROJECT_DIR$/application/admin/view/goods/index.html">  
417 - <provider selected="true" editor-type-id="text-editor">  
418 - <state relative-caret-position="340">  
419 - <caret line="20" column="33" selection-start-line="14" selection-start-column="24" selection-end-line="20" selection-end-column="33" />  
420 - </state>  
421 - </provider>  
422 - </entry>  
423 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/goods.js">  
424 - <provider selected="true" editor-type-id="text-editor">  
425 - <state relative-caret-position="357">  
426 - <caret line="21" column="36" selection-start-line="21" selection-start-column="36" selection-end-line="21" selection-end-column="36" />  
427 - </state>  
428 - </provider>  
429 - </entry>  
430 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/password.js"> 488 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/password.js">
431 <provider selected="true" editor-type-id="text-editor"> 489 <provider selected="true" editor-type-id="text-editor">
432 <state relative-caret-position="340"> 490 <state relative-caret-position="340">
@@ -486,13 +544,6 @@ @@ -486,13 +544,6 @@
486 <entry file="file://$PROJECT_DIR$/application/admin/config.php"> 544 <entry file="file://$PROJECT_DIR$/application/admin/config.php">
487 <provider selected="true" editor-type-id="text-editor" /> 545 <provider selected="true" editor-type-id="text-editor" />
488 </entry> 546 </entry>
489 - <entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">  
490 - <provider selected="true" editor-type-id="text-editor">  
491 - <state relative-caret-position="271">  
492 - <caret line="186" column="13" selection-start-line="186" selection-start-column="8" selection-end-line="186" selection-end-column="13" />  
493 - </state>  
494 - </provider>  
495 - </entry>  
496 <entry file="file://$PROJECT_DIR$/application/extra/site.php"> 547 <entry file="file://$PROJECT_DIR$/application/extra/site.php">
497 <provider selected="true" editor-type-id="text-editor"> 548 <provider selected="true" editor-type-id="text-editor">
498 <state relative-caret-position="51"> 549 <state relative-caret-position="51">
@@ -509,14 +560,28 @@ @@ -509,14 +560,28 @@
509 </entry> 560 </entry>
510 <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css"> 561 <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css">
511 <provider selected="true" editor-type-id="text-editor"> 562 <provider selected="true" editor-type-id="text-editor">
512 - <state relative-caret-position="679"> 563 + <state relative-caret-position="1972">
513 <caret line="116" column="22" selection-start-line="116" selection-start-column="22" selection-end-line="116" selection-end-column="22" /> 564 <caret line="116" column="22" selection-start-line="116" selection-start-column="22" selection-end-line="116" selection-end-column="22" />
514 </state> 565 </state>
515 </provider> 566 </provider>
516 </entry> 567 </entry>
  568 + <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
  569 + <provider selected="true" editor-type-id="text-editor">
  570 + <state relative-caret-position="289">
  571 + <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="19" selection-end-column="24" />
  572 + </state>
  573 + </provider>
  574 + </entry>
  575 + <entry file="file://$PROJECT_DIR$/application/config.php">
  576 + <provider selected="true" editor-type-id="text-editor">
  577 + <state relative-caret-position="935">
  578 + <caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" />
  579 + </state>
  580 + </provider>
  581 + </entry>
517 <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> 582 <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
518 <provider selected="true" editor-type-id="text-editor"> 583 <provider selected="true" editor-type-id="text-editor">
519 - <state relative-caret-position="2210"> 584 + <state relative-caret-position="810">
520 <caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" /> 585 <caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" />
521 <folding> 586 <folding>
522 <element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 587 <element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -524,31 +589,69 @@ @@ -524,31 +589,69 @@
524 </state> 589 </state>
525 </provider> 590 </provider>
526 </entry> 591 </entry>
527 - <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css"> 592 + <entry file="file://$PROJECT_DIR$/application/admin/validate/Goods.php">
  593 + <provider selected="true" editor-type-id="text-editor" />
  594 + </entry>
  595 + <entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
528 <provider selected="true" editor-type-id="text-editor"> 596 <provider selected="true" editor-type-id="text-editor">
529 - <state relative-caret-position="289">  
530 - <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="19" selection-end-column="24" /> 597 + <state relative-caret-position="1337">
  598 + <caret line="489" column="44" lean-forward="true" selection-start-line="489" selection-start-column="44" selection-end-line="489" selection-end-column="44" />
531 </state> 599 </state>
532 </provider> 600 </provider>
533 </entry> 601 </entry>
534 - <entry file="file://$PROJECT_DIR$/application/config.php"> 602 + <entry file="file://$PROJECT_DIR$/application/admin/view/goods/edit.html">
535 <provider selected="true" editor-type-id="text-editor"> 603 <provider selected="true" editor-type-id="text-editor">
536 - <state relative-caret-position="477">  
537 - <caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" /> 604 + <state relative-caret-position="187">
  605 + <caret line="11" column="95" selection-start-line="11" selection-start-column="95" selection-end-line="11" selection-end-column="95" />
  606 + </state>
  607 + </provider>
  608 + </entry>
  609 + <entry file="file://$PROJECT_DIR$/application/admin/view/goods/add.html">
  610 + <provider selected="true" editor-type-id="text-editor">
  611 + <state relative-caret-position="187">
  612 + <caret line="11" column="33" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="33" />
  613 + </state>
  614 + </provider>
  615 + </entry>
  616 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/goods.js">
  617 + <provider selected="true" editor-type-id="text-editor">
  618 + <state relative-caret-position="136">
  619 + <caret line="8" column="44" lean-forward="true" selection-start-line="8" selection-start-column="44" selection-end-line="8" selection-end-column="44" />
  620 + </state>
  621 + </provider>
  622 + </entry>
  623 + <entry file="file://$PROJECT_DIR$/application/admin/view/goods/index.html">
  624 + <provider selected="true" editor-type-id="text-editor">
  625 + <state relative-caret-position="170">
  626 + <caret line="10" column="67" lean-forward="true" selection-start-line="10" selection-start-column="67" selection-end-line="10" selection-end-column="67" />
  627 + </state>
  628 + </provider>
  629 + </entry>
  630 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Goods.php">
  631 + <provider selected="true" editor-type-id="text-editor">
  632 + <state relative-caret-position="374">
  633 + <caret line="22" column="24" selection-start-line="22" selection-start-column="24" selection-end-line="22" selection-end-column="24" />
  634 + </state>
  635 + </provider>
  636 + </entry>
  637 + <entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
  638 + <provider selected="true" editor-type-id="text-editor">
  639 + <state relative-caret-position="289">
  640 + <caret line="279" column="13" selection-start-line="279" selection-start-column="13" selection-end-line="279" selection-end-column="13" />
538 </state> 641 </state>
539 </provider> 642 </provider>
540 </entry> 643 </entry>
541 <entry file="file://$PROJECT_DIR$/application/home/view/index/login.html"> 644 <entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
542 <provider selected="true" editor-type-id="text-editor"> 645 <provider selected="true" editor-type-id="text-editor">
543 - <state relative-caret-position="487">  
544 - <caret line="75" column="32" selection-start-line="75" selection-start-column="32" selection-end-line="75" selection-end-column="32" /> 646 + <state relative-caret-position="470">
  647 + <caret line="74" column="116" selection-start-line="74" selection-start-column="116" selection-end-line="74" selection-end-column="116" />
545 </state> 648 </state>
546 </provider> 649 </provider>
547 </entry> 650 </entry>
548 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 651 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
549 <provider selected="true" editor-type-id="text-editor"> 652 <provider selected="true" editor-type-id="text-editor">
550 <state relative-caret-position="442"> 653 <state relative-caret-position="442">
551 - <caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" /> 654 + <caret line="31" column="33" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
552 <folding> 655 <folding>
553 <element signature="e#128#163#0#PHP" expanded="true" /> 656 <element signature="e#128#163#0#PHP" expanded="true" />
554 </folding> 657 </folding>
@@ -7,6 +7,12 @@ @@ -7,6 +7,12 @@
7 </div> 7 </div>
8 </div> 8 </div>
9 <div class="form-group"> 9 <div class="form-group">
  10 + <label class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
  11 + <div class="col-xs-12 col-sm-8">
  12 + <input id="c-password" data-rule="required" class="form-control" name="row[password]" type="text">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
10 <label class="control-label col-xs-12 col-sm-2">{:__('Starttime')}:</label> 16 <label class="control-label col-xs-12 col-sm-2">{:__('Starttime')}:</label>
11 <div class="col-xs-12 col-sm-8"> 17 <div class="col-xs-12 col-sm-8">
12 <input id="c-starttime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[starttime]" type="text" value="{:date('Y-m-d H:i:s')}"> 18 <input id="c-starttime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[starttime]" type="text" value="{:date('Y-m-d H:i:s')}">
@@ -7,6 +7,12 @@ @@ -7,6 +7,12 @@
7 </div> 7 </div>
8 </div> 8 </div>
9 <div class="form-group"> 9 <div class="form-group">
  10 + <label class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
  11 + <div class="col-xs-12 col-sm-8">
  12 + <input id="c-password" data-rule="required" class="form-control" name="row[password]" type="text" value="{$row.password|htmlentities}">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
10 <label class="control-label col-xs-12 col-sm-2">{:__('Starttime')}:</label> 16 <label class="control-label col-xs-12 col-sm-2">{:__('Starttime')}:</label>
11 <div class="col-xs-12 col-sm-8"> 17 <div class="col-xs-12 col-sm-8">
12 <input id="c-starttime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[starttime]" type="text" value="{:$row.starttime?datetime($row.starttime):''}"> 18 <input id="c-starttime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[starttime]" type="text" value="{:$row.starttime?datetime($row.starttime):''}">
@@ -23,18 +23,26 @@ class Index extends Controller @@ -23,18 +23,26 @@ class Index extends Controller
23 if(empty($param['password'])){ 23 if(empty($param['password'])){
24 $this->error('404'); 24 $this->error('404');
25 } 25 }
26 - $password = Db::name('password')->where(['id'=>1])->value('password'); 26 + /*$password = Db::name('password')->where(['id'=>1])->value('password');
27 if($param['password'] != $password){ 27 if($param['password'] != $password){
28 $this->error('密码错误'); 28 $this->error('密码错误');
  29 + }*/
  30 + $data = Db::name('goods')->where(['password'=>$param['password']])->order('id desc')->find();
  31 + if(empty($data)){
  32 + $this->error('密码错误');
29 } 33 }
30 - session('status',1);  
31 - $this->success('SUCCESS'); 34 + session("status_$data[id]",1);
  35 + $this->success('SUCCESS','',$data);
32 } 36 }
33 public function index(){ 37 public function index(){
34 - if(empty(session('status'))){ 38 + $goods_id = $this->request->param('goods_id',0,'intval');
  39 + if(empty($goods_id)){
  40 + $this->error('404');
  41 + }
  42 + if(empty(session("status_$goods_id"))){
35 $this->redirect('login'); 43 $this->redirect('login');
36 } 44 }
37 - $data = Db::name('goods')->where(['id'=>1])->find(); 45 + $data = Db::name('goods')->where(['id'=>$goods_id])->find();
38 $data = collection($data)->toArray(); 46 $data = collection($data)->toArray();
39 $images = explode(',',$data['images']); 47 $images = explode(',',$data['images']);
40 foreach($images as $key => $i){ 48 foreach($images as $key => $i){
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 if(res.code == 1){ 72 if(res.code == 1){
73 toast('登陆成功'); 73 toast('登陆成功');
74 setTimeout(function(){ 74 setTimeout(function(){
75 - window.location.href = "{:url('home/index/index')}"; 75 + window.location.href = "{:url('home/index/index','',false,true)}/goods_id/"+res.data.id;
76 },2500); 76 },2500);
77 }else{ 77 }else{
78 toast(res.msg); 78 toast(res.msg);
@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
28 {checkbox: true}, 28 {checkbox: true},
29 {field: 'id', title: __('Id')}, 29 {field: 'id', title: __('Id')},
30 {field: 'title', title: __('Title')}, 30 {field: 'title', title: __('Title')},
  31 + {field: 'password', title: __('密码')},
31 {field: 'starttime', title: __('Starttime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 32 {field: 'starttime', title: __('Starttime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
32 {field: 'endtime', title: __('Endtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 33 {field: 'endtime', title: __('Endtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
33 {field: 'images', title: __('Images'), events: Table.api.events.image, formatter: Table.api.formatter.images}, 34 {field: 'images', title: __('Images'), events: Table.api.events.image, formatter: Table.api.formatter.images},