郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 64293bac7d19f1821066d78d4b0cb25aba9791cc 1 个父辈 616fd657
1 个管道 的构建 通过 耗费 7 秒

修改

内嵌 并排对比
正在显示 10 个修改的文件 包含 321 行增加 和 236 行删除
@@ -2,9 +2,16 @@ @@ -2,9 +2,16 @@
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/simpleboot3/index/user/login.html" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" afterPath="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config.php" afterPath="$PROJECT_DIR$/app/config.php" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" /> 10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/index/controller/UserController.php" afterPath="$PROJECT_DIR$/app/index/controller/UserController.php" /> 11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/index/controller/UserController.php" afterPath="$PROJECT_DIR$/app/index/controller/UserController.php" />
  12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
  13 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
  14 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
8 </list> 15 </list>
9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 16 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10 <option name="TRACKING_ENABLED" value="true" /> 17 <option name="TRACKING_ENABLED" value="true" />
@@ -26,30 +33,32 @@ @@ -26,30 +33,32 @@
26 </component> 33 </component>
27 <component name="FileEditorManager"> 34 <component name="FileEditorManager">
28 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 35 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
29 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">  
30 - <entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php"> 36 + <file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
  37 + <entry file="file://$PROJECT_DIR$/app/admin/controller/SubscribeController.php">
31 <provider selected="true" editor-type-id="text-editor"> 38 <provider selected="true" editor-type-id="text-editor">
32 - <state relative-caret-position="250">  
33 - <caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="19" selection-end-column="5" />  
34 - <folding>  
35 - <element signature="e#130#170#0#PHP" expanded="true" />  
36 - </folding> 39 + <state relative-caret-position="311">
  40 + <caret line="32" column="9" lean-forward="false" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
  41 + <folding />
37 </state> 42 </state>
38 </provider> 43 </provider>
39 </entry> 44 </entry>
40 </file> 45 </file>
41 - <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">  
42 - <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php"> 46 + <file leaf-file-name="config.php" pinned="false" current-in-tab="true">
  47 + <entry file="file://$PROJECT_DIR$/app/config.php">
43 <provider selected="true" editor-type-id="text-editor"> 48 <provider selected="true" editor-type-id="text-editor">
44 - <state relative-caret-position="450">  
45 - <caret line="44" column="40" lean-forward="true" selection-start-line="44" selection-start-column="40" selection-end-line="44" selection-end-column="40" />  
46 - <folding>  
47 - <element signature="e#391#495#0#PHP" expanded="false" />  
48 - <element signature="e#514#722#0#PHP" expanded="false" />  
49 - <element signature="e#1707#1907#0#PHP" expanded="false" />  
50 - <element signature="e#1925#2321#0#PHP" expanded="false" />  
51 - <element signature="e#2339#2727#0#PHP" expanded="false" />  
52 - </folding> 49 + <state relative-caret-position="585">
  50 + <caret line="232" column="43" lean-forward="true" selection-start-line="232" selection-start-column="43" selection-end-line="232" selection-end-column="43" />
  51 + <folding />
  52 + </state>
  53 + </provider>
  54 + </entry>
  55 + </file>
  56 + <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
  57 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html">
  58 + <provider selected="true" editor-type-id="text-editor">
  59 + <state relative-caret-position="975">
  60 + <caret line="39" column="42" lean-forward="false" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
  61 + <folding />
53 </state> 62 </state>
54 </provider> 63 </provider>
55 </entry> 64 </entry>
@@ -69,14 +78,11 @@ @@ -69,14 +78,11 @@
69 <component name="IdeDocumentHistory"> 78 <component name="IdeDocumentHistory">
70 <option name="CHANGED_PATHS"> 79 <option name="CHANGED_PATHS">
71 <list> 80 <list>
72 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />  
73 <option value="$PROJECT_DIR$/app/admin/controller/SeverController.php" /> 81 <option value="$PROJECT_DIR$/app/admin/controller/SeverController.php" />
74 <option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" /> 82 <option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" />
75 <option value="$USER_HOME$/Desktop/Index.php" /> 83 <option value="$USER_HOME$/Desktop/Index.php" />
76 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />  
77 <option value="$PROJECT_DIR$/app/admin/controller/FeeController.php" /> 84 <option value="$PROJECT_DIR$/app/admin/controller/FeeController.php" />
78 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html" /> 85 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html" />
79 - <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />  
80 <option value="$PROJECT_DIR$/app/index/model/RecycletypeModel.php" /> 86 <option value="$PROJECT_DIR$/app/index/model/RecycletypeModel.php" />
81 <option value="$PROJECT_DIR$/app/index/model/RecyclegoodsModel.php" /> 87 <option value="$PROJECT_DIR$/app/index/model/RecyclegoodsModel.php" />
82 <option value="$PROJECT_DIR$/app/index/model/NorecyclegoodsModel.php" /> 88 <option value="$PROJECT_DIR$/app/index/model/NorecyclegoodsModel.php" />
@@ -109,17 +115,20 @@ @@ -109,17 +115,20 @@
109 <option value="$PROJECT_DIR$/data/conf/database.php" /> 115 <option value="$PROJECT_DIR$/data/conf/database.php" />
110 <option value="$PROJECT_DIR$/.gitlab-ci.yml" /> 116 <option value="$PROJECT_DIR$/.gitlab-ci.yml" />
111 <option value="$PROJECT_DIR$/app/admin/controller/AboutController.php" /> 117 <option value="$PROJECT_DIR$/app/admin/controller/AboutController.php" />
112 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />  
113 - <option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />  
114 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />  
115 - <option value="$PROJECT_DIR$/app/config.php" />  
116 <option value="$PROJECT_DIR$/public/static/style/base.css" /> 118 <option value="$PROJECT_DIR$/public/static/style/base.css" />
117 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" /> 119 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
118 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/user/index.html" /> 120 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/user/index.html" />
119 <option value="$PROJECT_DIR$/app/user/controller/IndexController.php" /> 121 <option value="$PROJECT_DIR$/app/user/controller/IndexController.php" />
120 <option value="$PROJECT_DIR$/app/index/controller/RecycleController.php" /> 122 <option value="$PROJECT_DIR$/app/index/controller/RecycleController.php" />
121 - <option value="$PROJECT_DIR$/app/index/controller/UserController.php" />  
122 <option value="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" /> 123 <option value="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" />
  124 + <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/user/login.html" />
  125 + <option value="$PROJECT_DIR$/app/index/controller/UserController.php" />
  126 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
  127 + <option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
  128 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
  129 + <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
  130 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
  131 + <option value="$PROJECT_DIR$/app/config.php" />
123 </list> 132 </list>
124 </option> 133 </option>
125 </component> 134 </component>
@@ -138,10 +147,10 @@ @@ -138,10 +147,10 @@
138 </component> 147 </component>
139 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 148 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
140 <component name="ProjectFrameBounds" extendedState="1"> 149 <component name="ProjectFrameBounds" extendedState="1">
141 - <option name="x" value="299" />  
142 - <option name="y" value="71" /> 150 + <option name="x" value="265" />
  151 + <option name="y" value="38" />
143 <option name="width" value="1678" /> 152 <option name="width" value="1678" />
144 - <option name="height" value="1086" /> 153 + <option name="height" value="1097" />
145 </component> 154 </component>
146 <component name="ProjectView"> 155 <component name="ProjectView">
147 <navigator currentView="ProjectPane" proportions="" version="1"> 156 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -158,7 +167,6 @@ @@ -158,7 +167,6 @@
158 <foldersAlwaysOnTop value="true" /> 167 <foldersAlwaysOnTop value="true" />
159 </navigator> 168 </navigator>
160 <panes> 169 <panes>
161 - <pane id="Scope" />  
162 <pane id="ProjectPane"> 170 <pane id="ProjectPane">
163 <subPane> 171 <subPane>
164 <expand> 172 <expand>
@@ -171,29 +179,17 @@ @@ -171,29 +179,17 @@
171 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 179 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
172 <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> 180 <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
173 </path> 181 </path>
174 - <path>  
175 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
176 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
177 - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />  
178 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />  
179 - </path>  
180 - <path>  
181 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
182 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
183 - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />  
184 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />  
185 - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />  
186 - </path>  
187 </expand> 182 </expand>
188 <select /> 183 <select />
189 </subPane> 184 </subPane>
190 </pane> 185 </pane>
191 <pane id="Scratches" /> 186 <pane id="Scratches" />
  187 + <pane id="Scope" />
192 </panes> 188 </panes>
193 </component> 189 </component>
194 <component name="PropertiesComponent"> 190 <component name="PropertiesComponent">
195 <property name="WebServerToolWindowFactoryState" value="false" /> 191 <property name="WebServerToolWindowFactoryState" value="false" />
196 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/lawyer" /> 192 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
197 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 193 <property name="DefaultHtmlFileTemplate" value="HTML File" />
198 </component> 194 </component>
199 <component name="RecentsManager"> 195 <component name="RecentsManager">
@@ -254,18 +250,19 @@ @@ -254,18 +250,19 @@
254 <workItem from="1573448892997" duration="1343000" /> 250 <workItem from="1573448892997" duration="1343000" />
255 <workItem from="1573450754427" duration="9613000" /> 251 <workItem from="1573450754427" duration="9613000" />
256 <workItem from="1573463816109" duration="4867000" /> 252 <workItem from="1573463816109" duration="4867000" />
257 - <workItem from="1573517804403" duration="14189000" /> 253 + <workItem from="1573517804403" duration="18784000" />
  254 + <workItem from="1573542205740" duration="500000" />
258 </task> 255 </task>
259 <servers /> 256 <servers />
260 </component> 257 </component>
261 <component name="TimeTrackingManager"> 258 <component name="TimeTrackingManager">
262 - <option name="totallyTimeSpent" value="198032000" /> 259 + <option name="totallyTimeSpent" value="203127000" />
263 </component> 260 </component>
264 <component name="ToolWindowManager"> 261 <component name="ToolWindowManager">
265 - <frame x="299" y="71" width="1678" height="1086" extended-state="1" /> 262 + <frame x="265" y="38" width="1678" height="1097" extended-state="1" />
266 <editor active="true" /> 263 <editor active="true" />
267 <layout> 264 <layout>
268 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19592088" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 265 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19839308" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
269 <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" /> 266 <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" />
270 <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" /> 267 <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" />
271 <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" /> 268 <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" />
@@ -311,79 +308,15 @@ @@ -311,79 +308,15 @@
311 </component> 308 </component>
312 <component name="XDebuggerManager"> 309 <component name="XDebuggerManager">
313 <breakpoint-manager> 310 <breakpoint-manager>
314 - <option name="time" value="5" /> 311 + <option name="time" value="6" />
315 </breakpoint-manager> 312 </breakpoint-manager>
316 <watches-manager /> 313 <watches-manager />
317 </component> 314 </component>
318 <component name="editorHistoryManager"> 315 <component name="editorHistoryManager">
319 - <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Config.php">  
320 - <provider selected="true" editor-type-id="text-editor">  
321 - <state relative-caret-position="-3212">  
322 - <caret line="13" column="6" lean-forward="false" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />  
323 - <folding />  
324 - </state>  
325 - </provider>  
326 - </entry>  
327 - <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">  
328 - <provider selected="true" editor-type-id="text-editor">  
329 - <state relative-caret-position="437">  
330 - <caret line="107" column="21" lean-forward="false" selection-start-line="107" selection-start-column="21" selection-end-line="107" selection-end-column="21" />  
331 - <folding />  
332 - </state>  
333 - </provider>  
334 - </entry>  
335 - <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">  
336 - <provider selected="true" editor-type-id="text-editor">  
337 - <state relative-caret-position="325">  
338 - <caret line="20" column="7" lean-forward="false" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />  
339 - <folding>  
340 - <element signature="e#602#906#0#PHP" expanded="false" />  
341 - <element signature="e#911#1805#0#PHP" expanded="false" />  
342 - <element signature="e#1811#2278#0#PHP" expanded="false" />  
343 - <element signature="e#2283#5971#0#PHP" expanded="false" />  
344 - <element signature="e#5977#6278#0#PHP" expanded="false" />  
345 - <element signature="e#6283#7591#0#PHP" expanded="false" />  
346 - </folding>  
347 - </state>  
348 - </provider>  
349 - </entry>  
350 - <entry file="file://$PROJECT_DIR$/api/admin/controller/PublicController.php">  
351 - <provider selected="true" editor-type-id="text-editor">  
352 - <state relative-caret-position="-1275">  
353 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
354 - <folding />  
355 - </state>  
356 - </provider>  
357 - </entry>  
358 - <entry file="file://$PROJECT_DIR$/app/portal/controller/PayController.php">  
359 - <provider selected="true" editor-type-id="text-editor">  
360 - <state relative-caret-position="-1350">  
361 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
362 - <folding />  
363 - </state>  
364 - </provider>  
365 - </entry>  
366 - <entry file="file://$PROJECT_DIR$/app/portal/controller/PageController.php">  
367 - <provider selected="true" editor-type-id="text-editor">  
368 - <state relative-caret-position="0">  
369 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
370 - <folding />  
371 - </state>  
372 - </provider>  
373 - </entry>  
374 - <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">  
375 - <provider selected="true" editor-type-id="text-editor">  
376 - <state relative-caret-position="0">  
377 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
378 - <folding />  
379 - </state>  
380 - </provider>  
381 - </entry>  
382 <entry file="file://$PROJECT_DIR$/app/portal/controller/TagController.php"> 316 <entry file="file://$PROJECT_DIR$/app/portal/controller/TagController.php">
383 <provider selected="true" editor-type-id="text-editor"> 317 <provider selected="true" editor-type-id="text-editor">
384 <state relative-caret-position="0"> 318 <state relative-caret-position="0">
385 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 319 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
386 - <folding />  
387 </state> 320 </state>
388 </provider> 321 </provider>
389 </entry> 322 </entry>
@@ -391,7 +324,6 @@ @@ -391,7 +324,6 @@
391 <provider selected="true" editor-type-id="text-editor"> 324 <provider selected="true" editor-type-id="text-editor">
392 <state relative-caret-position="0"> 325 <state relative-caret-position="0">
393 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 326 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
394 - <folding />  
395 </state> 327 </state>
396 </provider> 328 </provider>
397 </entry> 329 </entry>
@@ -399,7 +331,6 @@ @@ -399,7 +331,6 @@
399 <provider selected="true" editor-type-id="text-editor"> 331 <provider selected="true" editor-type-id="text-editor">
400 <state relative-caret-position="-562"> 332 <state relative-caret-position="-562">
401 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 333 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
402 - <folding />  
403 </state> 334 </state>
404 </provider> 335 </provider>
405 </entry> 336 </entry>
@@ -407,7 +338,6 @@ @@ -407,7 +338,6 @@
407 <provider selected="true" editor-type-id="text-editor"> 338 <provider selected="true" editor-type-id="text-editor">
408 <state relative-caret-position="0"> 339 <state relative-caret-position="0">
409 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 340 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
410 - <folding />  
411 </state> 341 </state>
412 </provider> 342 </provider>
413 </entry> 343 </entry>
@@ -415,7 +345,6 @@ @@ -415,7 +345,6 @@
415 <provider selected="true" editor-type-id="text-editor"> 345 <provider selected="true" editor-type-id="text-editor">
416 <state relative-caret-position="299"> 346 <state relative-caret-position="299">
417 <caret line="354" column="19" lean-forward="true" selection-start-line="354" selection-start-column="19" selection-end-line="354" selection-end-column="19" /> 347 <caret line="354" column="19" lean-forward="true" selection-start-line="354" selection-start-column="19" selection-end-line="354" selection-end-column="19" />
418 - <folding />  
419 </state> 348 </state>
420 </provider> 349 </provider>
421 </entry> 350 </entry>
@@ -423,7 +352,6 @@ @@ -423,7 +352,6 @@
423 <provider selected="true" editor-type-id="text-editor"> 352 <provider selected="true" editor-type-id="text-editor">
424 <state relative-caret-position="0"> 353 <state relative-caret-position="0">
425 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 354 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
426 - <folding />  
427 </state> 355 </state>
428 </provider> 356 </provider>
429 </entry> 357 </entry>
@@ -431,53 +359,14 @@ @@ -431,53 +359,14 @@
431 <provider selected="true" editor-type-id="text-editor"> 359 <provider selected="true" editor-type-id="text-editor">
432 <state relative-caret-position="425"> 360 <state relative-caret-position="425">
433 <caret line="32" column="42" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="62" selection-end-column="7" /> 361 <caret line="32" column="42" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="62" selection-end-column="7" />
434 - <folding />  
435 - </state>  
436 - </provider>  
437 - </entry>  
438 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">  
439 - <provider selected="true" editor-type-id="text-editor">  
440 - <state relative-caret-position="175">  
441 - <caret line="14" column="32" lean-forward="false" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />  
442 - <folding />  
443 - </state>  
444 - </provider>  
445 - </entry>  
446 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">  
447 - <provider selected="true" editor-type-id="text-editor">  
448 - <state relative-caret-position="550">  
449 - <caret line="122" column="5" lean-forward="false" selection-start-line="122" selection-start-column="5" selection-end-line="122" selection-end-column="5" />  
450 - <folding>  
451 - <element signature="e#131#170#0#PHP" expanded="false" />  
452 - <element signature="e#275#1168#0#PHP" expanded="false" />  
453 - <element signature="e#1185#2077#0#PHP" expanded="false" />  
454 - <element signature="e#2098#3253#0#PHP" expanded="false" />  
455 - <element signature="e#3274#3743#0#PHP" expanded="false" />  
456 - </folding>  
457 - </state>  
458 - </provider>  
459 - </entry>  
460 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">  
461 - <provider selected="true" editor-type-id="text-editor">  
462 - <state relative-caret-position="299">  
463 - <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />  
464 - <folding />  
465 - </state>  
466 - </provider>  
467 - </entry>  
468 - <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html">  
469 - <provider selected="true" editor-type-id="text-editor">  
470 - <state relative-caret-position="-75">  
471 - <caret line="12" column="62" lean-forward="true" selection-start-line="12" selection-start-column="62" selection-end-line="12" selection-end-column="62" />  
472 - <folding />  
473 </state> 362 </state>
474 </provider> 363 </provider>
475 </entry> 364 </entry>
  365 + <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
476 <entry file="file://$PROJECT_DIR$/api/home/controller/IndexController.php"> 366 <entry file="file://$PROJECT_DIR$/api/home/controller/IndexController.php">
477 <provider selected="true" editor-type-id="text-editor"> 367 <provider selected="true" editor-type-id="text-editor">
478 <state relative-caret-position="0"> 368 <state relative-caret-position="0">
479 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 369 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
480 - <folding />  
481 </state> 370 </state>
482 </provider> 371 </provider>
483 </entry> 372 </entry>
@@ -485,7 +374,6 @@ @@ -485,7 +374,6 @@
485 <provider selected="true" editor-type-id="text-editor"> 374 <provider selected="true" editor-type-id="text-editor">
486 <state relative-caret-position="-675"> 375 <state relative-caret-position="-675">
487 <caret line="17" column="6" lean-forward="false" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" /> 376 <caret line="17" column="6" lean-forward="false" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
488 - <folding />  
489 </state> 377 </state>
490 </provider> 378 </provider>
491 </entry> 379 </entry>
@@ -493,7 +381,6 @@ @@ -493,7 +381,6 @@
493 <provider selected="true" editor-type-id="text-editor"> 381 <provider selected="true" editor-type-id="text-editor">
494 <state relative-caret-position="0"> 382 <state relative-caret-position="0">
495 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 383 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
496 - <folding />  
497 </state> 384 </state>
498 </provider> 385 </provider>
499 </entry> 386 </entry>
@@ -501,7 +388,6 @@ @@ -501,7 +388,6 @@
501 <provider selected="true" editor-type-id="text-editor"> 388 <provider selected="true" editor-type-id="text-editor">
502 <state relative-caret-position="-150"> 389 <state relative-caret-position="-150">
503 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 390 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
504 - <folding />  
505 </state> 391 </state>
506 </provider> 392 </provider>
507 </entry> 393 </entry>
@@ -509,7 +395,6 @@ @@ -509,7 +395,6 @@
509 <provider selected="true" editor-type-id="text-editor"> 395 <provider selected="true" editor-type-id="text-editor">
510 <state relative-caret-position="-476"> 396 <state relative-caret-position="-476">
511 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 397 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
512 - <folding />  
513 </state> 398 </state>
514 </provider> 399 </provider>
515 </entry> 400 </entry>
@@ -517,7 +402,6 @@ @@ -517,7 +402,6 @@
517 <provider selected="true" editor-type-id="text-editor"> 402 <provider selected="true" editor-type-id="text-editor">
518 <state relative-caret-position="0"> 403 <state relative-caret-position="0">
519 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 404 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
520 - <folding />  
521 </state> 405 </state>
522 </provider> 406 </provider>
523 </entry> 407 </entry>
@@ -525,7 +409,6 @@ @@ -525,7 +409,6 @@
525 <provider selected="true" editor-type-id="text-editor"> 409 <provider selected="true" editor-type-id="text-editor">
526 <state relative-caret-position="0"> 410 <state relative-caret-position="0">
527 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 411 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
528 - <folding />  
529 </state> 412 </state>
530 </provider> 413 </provider>
531 </entry> 414 </entry>
@@ -533,7 +416,6 @@ @@ -533,7 +416,6 @@
533 <provider selected="true" editor-type-id="text-editor"> 416 <provider selected="true" editor-type-id="text-editor">
534 <state relative-caret-position="-1401"> 417 <state relative-caret-position="-1401">
535 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 418 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
536 - <folding />  
537 </state> 419 </state>
538 </provider> 420 </provider>
539 </entry> 421 </entry>
@@ -541,7 +423,6 @@ @@ -541,7 +423,6 @@
541 <provider selected="true" editor-type-id="text-editor"> 423 <provider selected="true" editor-type-id="text-editor">
542 <state relative-caret-position="-3000"> 424 <state relative-caret-position="-3000">
543 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 425 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
544 - <folding />  
545 </state> 426 </state>
546 </provider> 427 </provider>
547 </entry> 428 </entry>
@@ -549,7 +430,6 @@ @@ -549,7 +430,6 @@
549 <provider selected="true" editor-type-id="text-editor"> 430 <provider selected="true" editor-type-id="text-editor">
550 <state relative-caret-position="-951"> 431 <state relative-caret-position="-951">
551 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 432 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
552 - <folding />  
553 </state> 433 </state>
554 </provider> 434 </provider>
555 </entry> 435 </entry>
@@ -557,7 +437,6 @@ @@ -557,7 +437,6 @@
557 <provider selected="true" editor-type-id="text-editor"> 437 <provider selected="true" editor-type-id="text-editor">
558 <state relative-caret-position="0"> 438 <state relative-caret-position="0">
559 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 439 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
560 - <folding />  
561 </state> 440 </state>
562 </provider> 441 </provider>
563 </entry> 442 </entry>
@@ -565,7 +444,6 @@ @@ -565,7 +444,6 @@
565 <provider selected="true" editor-type-id="text-editor"> 444 <provider selected="true" editor-type-id="text-editor">
566 <state relative-caret-position="-2925"> 445 <state relative-caret-position="-2925">
567 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 446 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
568 - <folding />  
569 </state> 447 </state>
570 </provider> 448 </provider>
571 </entry> 449 </entry>
@@ -573,11 +451,6 @@ @@ -573,11 +451,6 @@
573 <provider selected="true" editor-type-id="text-editor"> 451 <provider selected="true" editor-type-id="text-editor">
574 <state relative-caret-position="300"> 452 <state relative-caret-position="300">
575 <caret line="22" column="27" lean-forward="true" selection-start-line="22" selection-start-column="27" selection-end-line="22" selection-end-column="27" /> 453 <caret line="22" column="27" lean-forward="true" selection-start-line="22" selection-start-column="27" selection-end-line="22" selection-end-column="27" />
576 - <folding>  
577 - <element signature="e#1318#3631#0#PHP" expanded="false" />  
578 - <element signature="e#3665#3754#0#PHP" expanded="false" />  
579 - <element signature="e#3790#5900#0#PHP" expanded="false" />  
580 - </folding>  
581 </state> 454 </state>
582 </provider> 455 </provider>
583 </entry> 456 </entry>
@@ -585,7 +458,6 @@ @@ -585,7 +458,6 @@
585 <provider selected="true" editor-type-id="text-editor"> 458 <provider selected="true" editor-type-id="text-editor">
586 <state relative-caret-position="-225"> 459 <state relative-caret-position="-225">
587 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 460 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
588 - <folding />  
589 </state> 461 </state>
590 </provider> 462 </provider>
591 </entry> 463 </entry>
@@ -593,7 +465,6 @@ @@ -593,7 +465,6 @@
593 <provider selected="true" editor-type-id="text-editor"> 465 <provider selected="true" editor-type-id="text-editor">
594 <state relative-caret-position="-226"> 466 <state relative-caret-position="-226">
595 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 467 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
596 - <folding />  
597 </state> 468 </state>
598 </provider> 469 </provider>
599 </entry> 470 </entry>
@@ -601,7 +472,6 @@ @@ -601,7 +472,6 @@
601 <provider selected="true" editor-type-id="text-editor"> 472 <provider selected="true" editor-type-id="text-editor">
602 <state relative-caret-position="-2250"> 473 <state relative-caret-position="-2250">
603 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 474 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
604 - <folding />  
605 </state> 475 </state>
606 </provider> 476 </provider>
607 </entry> 477 </entry>
@@ -609,7 +479,6 @@ @@ -609,7 +479,6 @@
609 <provider selected="true" editor-type-id="text-editor"> 479 <provider selected="true" editor-type-id="text-editor">
610 <state relative-caret-position="-1875"> 480 <state relative-caret-position="-1875">
611 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 481 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
612 - <folding />  
613 </state> 482 </state>
614 </provider> 483 </provider>
615 </entry> 484 </entry>
@@ -617,7 +486,6 @@ @@ -617,7 +486,6 @@
617 <provider selected="true" editor-type-id="text-editor"> 486 <provider selected="true" editor-type-id="text-editor">
618 <state relative-caret-position="-840"> 487 <state relative-caret-position="-840">
619 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 488 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
620 - <folding />  
621 </state> 489 </state>
622 </provider> 490 </provider>
623 </entry> 491 </entry>
@@ -625,7 +493,6 @@ @@ -625,7 +493,6 @@
625 <provider selected="true" editor-type-id="text-editor"> 493 <provider selected="true" editor-type-id="text-editor">
626 <state relative-caret-position="0"> 494 <state relative-caret-position="0">
627 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 495 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
628 - <folding />  
629 </state> 496 </state>
630 </provider> 497 </provider>
631 </entry> 498 </entry>
@@ -633,7 +500,6 @@ @@ -633,7 +500,6 @@
633 <provider selected="true" editor-type-id="text-editor"> 500 <provider selected="true" editor-type-id="text-editor">
634 <state relative-caret-position="0"> 501 <state relative-caret-position="0">
635 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 502 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
636 - <folding />  
637 </state> 503 </state>
638 </provider> 504 </provider>
639 </entry> 505 </entry>
@@ -641,7 +507,6 @@ @@ -641,7 +507,6 @@
641 <provider selected="true" editor-type-id="text-editor"> 507 <provider selected="true" editor-type-id="text-editor">
642 <state relative-caret-position="0"> 508 <state relative-caret-position="0">
643 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 509 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
644 - <folding />  
645 </state> 510 </state>
646 </provider> 511 </provider>
647 </entry> 512 </entry>
@@ -649,7 +514,6 @@ @@ -649,7 +514,6 @@
649 <provider selected="true" editor-type-id="text-editor"> 514 <provider selected="true" editor-type-id="text-editor">
650 <state relative-caret-position="-900"> 515 <state relative-caret-position="-900">
651 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 516 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
652 - <folding />  
653 </state> 517 </state>
654 </provider> 518 </provider>
655 </entry> 519 </entry>
@@ -657,7 +521,6 @@ @@ -657,7 +521,6 @@
657 <provider selected="true" editor-type-id="text-editor"> 521 <provider selected="true" editor-type-id="text-editor">
658 <state relative-caret-position="375"> 522 <state relative-caret-position="375">
659 <caret line="15" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="137" selection-end-column="7" /> 523 <caret line="15" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="137" selection-end-column="7" />
660 - <folding />  
661 </state> 524 </state>
662 </provider> 525 </provider>
663 </entry> 526 </entry>
@@ -665,7 +528,6 @@ @@ -665,7 +528,6 @@
665 <provider selected="true" editor-type-id="text-editor"> 528 <provider selected="true" editor-type-id="text-editor">
666 <state relative-caret-position="0"> 529 <state relative-caret-position="0">
667 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 530 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
668 - <folding />  
669 </state> 531 </state>
670 </provider> 532 </provider>
671 </entry> 533 </entry>
@@ -673,7 +535,6 @@ @@ -673,7 +535,6 @@
673 <provider selected="true" editor-type-id="text-editor"> 535 <provider selected="true" editor-type-id="text-editor">
674 <state relative-caret-position="324"> 536 <state relative-caret-position="324">
675 <caret line="18" column="19" lean-forward="true" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" /> 537 <caret line="18" column="19" lean-forward="true" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
676 - <folding />  
677 </state> 538 </state>
678 </provider> 539 </provider>
679 </entry> 540 </entry>
@@ -689,7 +550,6 @@ @@ -689,7 +550,6 @@
689 <provider selected="true" editor-type-id="text-editor"> 550 <provider selected="true" editor-type-id="text-editor">
690 <state relative-caret-position="300"> 551 <state relative-caret-position="300">
691 <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" /> 552 <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
692 - <folding />  
693 </state> 553 </state>
694 </provider> 554 </provider>
695 </entry> 555 </entry>
@@ -697,7 +557,6 @@ @@ -697,7 +557,6 @@
697 <provider selected="true" editor-type-id="text-editor"> 557 <provider selected="true" editor-type-id="text-editor">
698 <state relative-caret-position="332"> 558 <state relative-caret-position="332">
699 <caret line="72" column="1" lean-forward="true" selection-start-line="72" selection-start-column="1" selection-end-line="72" selection-end-column="1" /> 559 <caret line="72" column="1" lean-forward="true" selection-start-line="72" selection-start-column="1" selection-end-line="72" selection-end-column="1" />
700 - <folding />  
701 </state> 560 </state>
702 </provider> 561 </provider>
703 </entry> 562 </entry>
@@ -705,7 +564,6 @@ @@ -705,7 +564,6 @@
705 <provider selected="true" editor-type-id="text-editor"> 564 <provider selected="true" editor-type-id="text-editor">
706 <state relative-caret-position="200"> 565 <state relative-caret-position="200">
707 <caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" /> 566 <caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
708 - <folding />  
709 </state> 567 </state>
710 </provider> 568 </provider>
711 </entry> 569 </entry>
@@ -713,19 +571,6 @@ @@ -713,19 +571,6 @@
713 <provider selected="true" editor-type-id="text-editor"> 571 <provider selected="true" editor-type-id="text-editor">
714 <state relative-caret-position="200"> 572 <state relative-caret-position="200">
715 <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" /> 573 <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
716 - <folding>  
717 - <element signature="e#813#1918#0#PHP" expanded="false" />  
718 - <element signature="e#1924#2026#0#PHP" expanded="false" />  
719 - <element signature="e#2031#3227#0#PHP" expanded="false" />  
720 - <element signature="e#3233#3328#0#PHP" expanded="false" />  
721 - <element signature="e#3333#4931#0#PHP" expanded="false" />  
722 - <element signature="e#4937#4966#0#PHP" expanded="false" />  
723 - <element signature="e#4971#5333#0#PHP" expanded="false" />  
724 - <element signature="e#5339#5375#0#PHP" expanded="false" />  
725 - <element signature="e#5380#5584#0#PHP" expanded="false" />  
726 - <element signature="e#5590#5612#0#PHP" expanded="false" />  
727 - <element signature="e#5617#5749#0#PHP" expanded="false" />  
728 - </folding>  
729 </state> 574 </state>
730 </provider> 575 </provider>
731 </entry> 576 </entry>
@@ -733,33 +578,100 @@ @@ -733,33 +578,100 @@
733 <provider selected="true" editor-type-id="text-editor"> 578 <provider selected="true" editor-type-id="text-editor">
734 <state relative-caret-position="-3000"> 579 <state relative-caret-position="-3000">
735 <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" /> 580 <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
736 - <folding /> 581 + </state>
  582 + </provider>
  583 + </entry>
  584 + <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
  585 + <provider selected="true" editor-type-id="text-editor">
  586 + <state relative-caret-position="300">
  587 + <caret line="26" column="12" lean-forward="true" selection-start-line="26" selection-start-column="12" selection-end-line="26" selection-end-column="12" />
  588 + </state>
  589 + </provider>
  590 + </entry>
  591 + <entry file="file://$USER_HOME$/Desktop/garbageCollect/register.html">
  592 + <provider selected="true" editor-type-id="text-editor">
  593 + <state relative-caret-position="400">
  594 + <caret line="16" column="28" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="149" selection-end-column="7" />
737 </state> 595 </state>
738 </provider> 596 </provider>
739 </entry> 597 </entry>
740 <entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php"> 598 <entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php">
741 <provider selected="true" editor-type-id="text-editor"> 599 <provider selected="true" editor-type-id="text-editor">
742 - <state relative-caret-position="250">  
743 - <caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="19" selection-end-column="5" />  
744 - <folding>  
745 - <element signature="e#130#170#0#PHP" expanded="true" />  
746 - </folding> 600 + <state relative-caret-position="325">
  601 + <caret line="22" column="45" lean-forward="true" selection-start-line="22" selection-start-column="45" selection-end-line="22" selection-end-column="45" />
747 </state> 602 </state>
748 </provider> 603 </provider>
749 </entry> 604 </entry>
750 - <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php"> 605 + <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/user/login.html">
751 <provider selected="true" editor-type-id="text-editor"> 606 <provider selected="true" editor-type-id="text-editor">
752 - <state relative-caret-position="450">  
753 - <caret line="44" column="40" lean-forward="true" selection-start-line="44" selection-start-column="40" selection-end-line="44" selection-end-column="40" /> 607 + <state relative-caret-position="474">
  608 + <caret line="53" column="44" lean-forward="false" selection-start-line="53" selection-start-column="44" selection-end-line="53" selection-end-column="44" />
  609 + </state>
  610 + </provider>
  611 + </entry>
  612 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html">
  613 + <provider selected="true" editor-type-id="text-editor">
  614 + <state relative-caret-position="-1090">
  615 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  616 + </state>
  617 + </provider>
  618 + </entry>
  619 + <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
  620 + <provider selected="true" editor-type-id="text-editor">
  621 + <state relative-caret-position="-375">
  622 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  623 + </state>
  624 + </provider>
  625 + </entry>
  626 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">
  627 + <provider selected="true" editor-type-id="text-editor">
  628 + <state relative-caret-position="1050">
  629 + <caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
  630 + </state>
  631 + </provider>
  632 + </entry>
  633 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">
  634 + <provider selected="true" editor-type-id="text-editor">
  635 + <state relative-caret-position="259">
  636 + <caret line="34" column="17" lean-forward="true" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="17" />
  637 + </state>
  638 + </provider>
  639 + </entry>
  640 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
  641 + <provider selected="true" editor-type-id="text-editor">
  642 + <state relative-caret-position="485">
  643 + <caret line="118" column="32" lean-forward="true" selection-start-line="118" selection-start-column="32" selection-end-line="118" selection-end-column="32" />
754 <folding> 644 <folding>
755 - <element signature="e#391#495#0#PHP" expanded="false" />  
756 - <element signature="e#514#722#0#PHP" expanded="false" />  
757 - <element signature="e#1707#1907#0#PHP" expanded="false" />  
758 - <element signature="e#1925#2321#0#PHP" expanded="false" />  
759 - <element signature="e#2339#2727#0#PHP" expanded="false" /> 645 + <element signature="e#275#1168#0#PHP" expanded="false" />
  646 + <element signature="e#1185#2077#0#PHP" expanded="false" />
  647 + <element signature="e#2098#3379#0#PHP" expanded="false" />
760 </folding> 648 </folding>
761 </state> 649 </state>
762 </provider> 650 </provider>
763 </entry> 651 </entry>
  652 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html">
  653 + <provider selected="true" editor-type-id="text-editor">
  654 + <state relative-caret-position="975">
  655 + <caret line="39" column="42" lean-forward="false" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
  656 + <folding />
  657 + </state>
  658 + </provider>
  659 + </entry>
  660 + <entry file="file://$PROJECT_DIR$/app/admin/controller/SubscribeController.php">
  661 + <provider selected="true" editor-type-id="text-editor">
  662 + <state relative-caret-position="311">
  663 + <caret line="32" column="9" lean-forward="false" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
  664 + <folding />
  665 + </state>
  666 + </provider>
  667 + </entry>
  668 + <entry file="file://$PROJECT_DIR$/app/config.php">
  669 + <provider selected="true" editor-type-id="text-editor">
  670 + <state relative-caret-position="585">
  671 + <caret line="232" column="43" lean-forward="true" selection-start-line="232" selection-start-column="43" selection-end-line="232" selection-end-column="43" />
  672 + <folding />
  673 + </state>
  674 + </provider>
  675 + </entry>
764 </component> 676 </component>
765 </project> 677 </project>
@@ -80,23 +80,26 @@ class ProjectController extends AdminBaseController @@ -80,23 +80,26 @@ class ProjectController extends AdminBaseController
80 //加入我们信息列表 80 //加入我们信息列表
81 public function addlist() 81 public function addlist()
82 { 82 {
83 - $where['delete_time'] = ['eq',0]; 83 + $where['a.delete_time'] = ['eq',0];
84 $param = $this->request->param(); 84 $param = $this->request->param();
85 $startTime = empty($param['start_time']) ? '' : strtotime($param['start_time']); 85 $startTime = empty($param['start_time']) ? '' : strtotime($param['start_time']);
86 $endTime = empty($param['end_time']) ? '' : (strtotime($param['end_time'])); 86 $endTime = empty($param['end_time']) ? '' : (strtotime($param['end_time']));
87 if (!empty($startTime) && !empty($endTime)) { 87 if (!empty($startTime) && !empty($endTime)) {
88 - $where['create_time'] = [['>= time', $startTime], ['<= time', $endTime]]; 88 + $where['a.create_time'] = [['>= time', $startTime], ['<= time', $endTime]];
89 } else { 89 } else {
90 if (!empty($startTime)) { 90 if (!empty($startTime)) {
91 - $where['create_time'] = ['>= time', $startTime]; 91 + $where['a.create_time'] = ['>= time', $startTime];
92 } 92 }
93 if (!empty($endTime)) { 93 if (!empty($endTime)) {
94 - $where['create_time'] = ['<= time', $endTime]; 94 + $where['a.create_time'] = ['<= time', $endTime];
95 } 95 }
96 } 96 }
97 $data = Db::name('join') 97 $data = Db::name('join')
  98 + ->alias('a')
  99 + ->join('user b','a.user_id = b.id')
  100 + ->field('a.*,b.user_nickname')
98 ->where($where) 101 ->where($where)
99 - ->order('id desc') 102 + ->order('a.id desc')
100 ->paginate(10); 103 ->paginate(10);
101 $list=$data->items(); 104 $list=$data->items();
102 $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : ''); 105 $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
@@ -114,6 +117,9 @@ class ProjectController extends AdminBaseController @@ -114,6 +117,9 @@ class ProjectController extends AdminBaseController
114 $param = $this->request->param(); 117 $param = $this->request->param();
115 $id = $this->request->param('id', 1, 'intval'); 118 $id = $this->request->param('id', 1, 'intval');
116 $data = Db::name('join') 119 $data = Db::name('join')
  120 + ->alias('a')
  121 + ->join('user b','a.user_id = b.id')
  122 + ->field('a.*,b.user_nickname')
117 ->where('id',$id) 123 ->where('id',$id)
118 ->find(); 124 ->find();
119 $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : ''); 125 $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
@@ -34,7 +34,8 @@ class SubscribeController extends AdminBaseController @@ -34,7 +34,8 @@ class SubscribeController extends AdminBaseController
34 $data = Db::name('subscribe') 34 $data = Db::name('subscribe')
35 ->alias('r') 35 ->alias('r')
36 ->join('recycle t','r.recycle_id = t.id') 36 ->join('recycle t','r.recycle_id = t.id')
37 - ->field('r.*,t.*') 37 + ->join('user u','r.user_id = u.id')
  38 + ->field('r.*,t.*,u.user_nickname')
38 ->where($where) 39 ->where($where)
39 ->order('r.id desc') 40 ->order('r.id desc')
40 ->paginate(10); 41 ->paginate(10);
@@ -234,7 +234,7 @@ $configs = [ @@ -234,7 +234,7 @@ $configs = [
234 'cmf_admin_default_theme' => 'admin_simpleboot3', 234 'cmf_admin_default_theme' => 'admin_simpleboot3',
235 235
236 //公众号配置 236 //公众号配置
237 - 'app_id'=>'wx46239f7a46865161',  
238 - 'app_secret'=>'f1bf05366ba86a619cf9da0a166cebd2', 237 + 'app_id'=>'wxc6ef42cbfc3497cf',
  238 + 'app_secret'=>'752789aeeb5b72a97e733c79d060e1d4',
239 ]; 239 ];
240 return array_merge($configs, $runtimeConfig,$wechatConfig); 240 return array_merge($configs, $runtimeConfig,$wechatConfig);
@@ -43,7 +43,6 @@ class ShopgoodsController extends WeChatBaseController @@ -43,7 +43,6 @@ class ShopgoodsController extends WeChatBaseController
43 $data['type'] = $this->index(); 43 $data['type'] = $this->index();
44 $data['photo'] = $this->photo(); 44 $data['photo'] = $this->photo();
45 $this->assign('data',$data); 45 $this->assign('data',$data);
46 - print_r($data);die;  
47 return $this->fetch(); 46 return $this->fetch();
48 }else{ 47 }else{
49 $shopGoodsModel = new ShopgoodsModel(); 48 $shopGoodsModel = new ShopgoodsModel();
@@ -53,7 +52,6 @@ class ShopgoodsController extends WeChatBaseController @@ -53,7 +52,6 @@ class ShopgoodsController extends WeChatBaseController
53 $data['type'] = $this->index(); 52 $data['type'] = $this->index();
54 $data['photo'] = $this->photo(); 53 $data['photo'] = $this->photo();
55 $this->assign('data',$data); 54 $this->assign('data',$data);
56 - print_r($data);die;  
57 return $this->fetch(); 55 return $this->fetch();
58 } 56 }
59 } 57 }
@@ -21,9 +21,22 @@ class UserController extends WeChatBaseController @@ -21,9 +21,22 @@ class UserController extends WeChatBaseController
21 public function index() 21 public function index()
22 { 22 {
23 $user_id = cmf_get_current_user_id(); 23 $user_id = cmf_get_current_user_id();
24 - $data = Db::name('user')->where(['id'=>$user_id])->find(); 24 + $data = Db::name('integral')
  25 + ->where('user_id',$user_id)
  26 + ->find()
  27 + ->toArray();
  28 + if(empty($data)){
  29 + return $this->fetch();
  30 + }else{
  31 + $this->assign('data',$data);
  32 + return $this->fetch();
  33 + }
  34 + }
25 35
26 - $this->assign('data',$data); 36 + //注册（绑定手机号）
  37 + public function login()
  38 + {
27 return $this->fetch(); 39 return $this->fetch();
28 } 40 }
  41 +
29 } 42 }
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
26 <thead> 26 <thead>
27 <tr> 27 <tr>
28 <th>ID</th> 28 <th>ID</th>
  29 + <th>昵称</th>
29 <th>姓名</th> 30 <th>姓名</th>
30 <th>电话</th> 31 <th>电话</th>
31 <th>邮箱</th> 32 <th>邮箱</th>
@@ -37,6 +38,7 @@ @@ -37,6 +38,7 @@
37 <foreach name="data" item="vo"> 38 <foreach name="data" item="vo">
38 <tr> 39 <tr>
39 <td>{$vo.id}</td> 40 <td>{$vo.id}</td>
  41 + <td>{$vo.user_nickname}</td>
40 <td>{$vo.name}</td> 42 <td>{$vo.name}</td>
41 <td>{$vo.phone}</td> 43 <td>{$vo.phone}</td>
42 <td>{$vo.email}</td> 44 <td>{$vo.email}</td>
@@ -22,28 +22,31 @@ @@ -22,28 +22,31 @@
22 <tr> 22 <tr>
23 <th width="100">姓名</th> 23 <th width="100">姓名</th>
24 <td> 24 <td>
25 - <input class="form-control" type="text" name="name"  
26 - id="name" value="{$data.name}" placeholder="请输入分类名称"/> 25 + {$data.name}
  26 + </td>
  27 + </tr>
  28 + <tr>
  29 + <th width="100">昵称</th>
  30 + <td>
  31 + {$data.user_nickname}
27 </td> 32 </td>
28 </tr> 33 </tr>
29 <tr> 34 <tr>
30 <th width="100">电话</th> 35 <th width="100">电话</th>
31 <td> 36 <td>
32 - <input class="form-control" type="text" name="phone"  
33 - id="phone" value="{$data.phone}" placeholder="请输入联系方式"/> 37 + {$data.phone}
34 </td> 38 </td>
35 </tr> 39 </tr>
36 <tr> 40 <tr>
37 <th width="100">邮箱</th> 41 <th width="100">邮箱</th>
38 <td> 42 <td>
39 - <input class="form-control" type="text" name="email"  
40 - id="email" value="{$data.email}" placeholder="请输入邮箱"/> 43 + {$data.email}
41 </td> 44 </td>
42 </tr> 45 </tr>
43 <tr> 46 <tr>
44 <th width="100">加盟信息</th> 47 <th width="100">加盟信息</th>
45 <td> 48 <td>
46 - <script type="text/plain" id="content" name="content">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.content))}</script> 49 + <script type="text/plain">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.content))}</script>
47 </td> 50 </td>
48 </tr> 51 </tr>
49 </table> 52 </table>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <foreach name="data" item="vo"> 37 <foreach name="data" item="vo">
38 <tr> 38 <tr>
39 <td>{$vo.id}</td> 39 <td>{$vo.id}</td>
40 - <td>下单人</td> 40 + <td>{$vo.user_nickname}</td>
41 <td>{$vo.num}</td> 41 <td>{$vo.num}</td>
42 <td>{:date('Y-m-d H:i:s',$vo.sub_time)}</td> 42 <td>{:date('Y-m-d H:i:s',$vo.sub_time)}</td>
43 <if condition=" $vo.status eq 0 "> 43 <if condition=" $vo.status eq 0 ">
  1 +<!DOCTYPE html>
  2 +<html>
  3 +
  4 +<head>
  5 + <meta charset="utf-8" />
  6 + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
  7 + <meta name="viewport" content="maximum-scale=1.0, minimum-scale=1.0, user-scalable=0, initial-scale=1.0, width=device-width" />
  8 + <meta name="format-detection" content="telephone=no, email=no, date=no, address=no" />
  9 + <title>注册</title>
  10 + <meta name="description" content="" />
  11 + <meta name="keywords" content="" />
  12 + <link rel="stylesheet" href="./style/base.css">
  13 + <link rel="stylesheet" href="./style/common.css">
  14 + <script src="./js/base.js"></script>
  15 + <style>
  16 + body {
  17 + background: #fff
  18 + }
  19 + </style>
  20 +</head>
  21 +
  22 +<body>
  23 +<!-- 吐司 -->
  24 +<div class="toast">
  25 + <div class="toast_title">1234</div>
  26 +</div>
  27 +<!-- 顶部 -->
  28 +<div class="register_top">
  29 + <div class="register_img"></div>
  30 +</div>
  31 +<div class="register_box">
  32 + <div class="register_contant">
  33 + <div class="register_title">登录</div>
  34 + <div class="register_one layer_star register_one_padding">
  35 + <div class="register_one_left layer_star">
  36 + <div class="register_one_icon">
  37 + <img src="./image/sun_46.png" alt="">
  38 + </div>
  39 + <div class="register_one_title">
  40 + 手机号
  41 + </div>
  42 + </div>
  43 + <div class="register_one_right">
  44 + <input type="text" placeholder="请输入手机号码" id="phone" maxlength="11">
  45 + </div>
  46 + </div>
  47 + <div class="register_one layer_star">
  48 + <div class="register_one_padding layer_star">
  49 + <div class="register_one_left layer_star">
  50 + <div class="register_one_icon">
  51 + <img src="./image/sun_47.png" alt="">
  52 + </div>
  53 + <div class="register_one_title">
  54 + 密&nbsp;&nbsp;&nbsp;码
  55 + </div>
  56 + </div>
  57 + <div class="register_one_right">
  58 + <input type="text" placeholder="请输入密码" id="password">
  59 + </div>
  60 + </div>
  61 + <div class="register_one_code" onclick="codeButton()" id="code">发送验证码</div>
  62 + </div>
  63 +
  64 + <div class="register_btn">确认注册</div>
  65 + <div class="register_word">
  66 + 注册即表示你已阅读并同意<a href="">《XX协议》</a>
  67 + </div>
  68 + </div>
  69 +</div>
  70 +<script src="js/jquery.js"></script>
  71 +<script type="text/javascript">
  72 + // 验证码
  73 + function codeButton() {
  74 + var phone = $("#phone").val();
  75 + var toast;
  76 + if (phone == "") {
  77 + toast = "手机号不能为空";
  78 + $(".toast").show();
  79 + $(".toast_title").text(toast)
  80 + setTimeout(function() {
  81 + hide()
  82 + }, 1500)
  83 + } else if (!(/^1[3456789]\d{9}$/.test(phone))) {
  84 + toast = "请输入正确的手机号码";
  85 + $(".toast").show();
  86 + $(".toast_title").text(toast)
  87 + setTimeout(function() {
  88 + hide()
  89 + }, 1500)
  90 + } else {
  91 + var code = $("#code");
  92 + code.attr("disabled", "disabled");
  93 + setTimeout(function() {
  94 + code.css("opacity", "0.8");
  95 + }, 1000);
  96 + var time = 60;
  97 + var set = setInterval(function() {
  98 + code.text("" + --time + "s");
  99 + }, 1000);
  100 + setTimeout(function() {
  101 + code.attr("disabled", false).text("重新获取");
  102 + clearInterval(set);
  103 + }, 60000);
  104 + }
  105 + };
  106 + // 确认注册
  107 + $(".register_btn").click(function() {
  108 + var phone = $("#phone").val();
  109 + var password = $("#password").val();
  110 + var toast;
  111 + if (phone == "") {
  112 + toast = "手机号不能为空";
  113 + $(".toast").show();
  114 + $(".toast_title").text(toast)
  115 + setTimeout(function() {
  116 + hide()
  117 + }, 1500)
  118 + } else if (!(/^1[3456789]\d{9}$/.test(phone))) {
  119 + toast = "请输入正确的手机号码";
  120 + $(".toast").show();
  121 + $(".toast_title").text(toast)
  122 + setTimeout(function() {
  123 + hide()
  124 + }, 1500)
  125 + } else if (password == '') {
  126 + toast = "密码不能为空";
  127 + $(".toast").show();
  128 + $(".toast_title").text(toast)
  129 + setTimeout(function() {
  130 + hide()
  131 + }, 1500)
  132 + } else if (password != '1234') {
  133 + toast = "密码不正确";
  134 + $(".toast").show();
  135 + $(".toast_title").text(toast)
  136 + setTimeout(function() {
  137 + hide()
  138 + }, 1500)
  139 + } else {
  140 + console.log("注册成功")
  141 + }
  142 + })
  143 +
  144 + function hide() {
  145 + $(".toast").hide()
  146 + }
  147 +</script>
  148 +</body>
  149 +
  150 +</html>