郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 94f2f73b83b250c219aa22da9b39c09d5e0e4e1f 1 个父辈 0e5866e2
1 个管道 的构建 通过 耗费 10 秒

修改废品回收

内嵌 并排对比
正在显示 5 个修改的文件 包含 297 行增加 和 339 行删除
@@ -2,10 +2,11 @@ @@ -2,10 +2,11 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
  5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/detail.html" />
  6 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />  
7 - <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" />  
8 - <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" /> 8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" afterPath="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
9 </list> 10 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 <option name="TRACKING_ENABLED" value="true" /> 12 <option name="TRACKING_ENABLED" value="true" />
@@ -27,78 +28,23 @@ @@ -27,78 +28,23 @@
27 </component> 28 </component>
28 <component name="FileEditorManager"> 29 <component name="FileEditorManager">
29 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 30 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
30 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">  
31 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 31 + <file leaf-file-name="PayController.php" pinned="false" current-in-tab="true">
  32 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
32 <provider selected="true" editor-type-id="text-editor"> 33 <provider selected="true" editor-type-id="text-editor">
33 - <state relative-caret-position="77">  
34 - <caret line="421" column="38" lean-forward="false" selection-start-line="421" selection-start-column="38" selection-end-line="421" selection-end-column="38" /> 34 + <state relative-caret-position="399">
  35 + <caret line="66" column="28" lean-forward="false" selection-start-line="66" selection-start-column="28" selection-end-line="66" selection-end-column="28" />
35 <folding> 36 <folding>
36 - <element signature="e#366#791#0#PHP" expanded="false" />  
37 - <element signature="e#796#1608#0#PHP" expanded="false" />  
38 - <element signature="e#1614#1872#0#PHP" expanded="false" />  
39 - <element signature="e#1877#2260#0#PHP" expanded="false" />  
40 - <element signature="e#2266#2495#0#PHP" expanded="false" />  
41 - <element signature="e#2500#4135#0#PHP" expanded="false" />  
42 - <element signature="e#4141#4381#0#PHP" expanded="false" />  
43 - <element signature="e#4386#4621#0#PHP" expanded="false" />  
44 - <element signature="e#4627#4974#0#PHP" expanded="false" />  
45 - <element signature="e#4979#5425#0#PHP" expanded="false" />  
46 - <element signature="e#5431#5691#0#PHP" expanded="false" />  
47 - <element signature="e#5696#5897#0#PHP" expanded="false" />  
48 - <element signature="e#5903#6165#0#PHP" expanded="false" />  
49 - <element signature="e#6170#6375#0#PHP" expanded="false" />  
50 - <element signature="e#6381#6860#0#PHP" expanded="false" />  
51 - <element signature="e#6865#9088#0#PHP" expanded="false" />  
52 - <element signature="e#9111#9642#0#PHP" expanded="false" />  
53 - <element signature="e#9648#9928#0#PHP" expanded="false" />  
54 - <element signature="e#9933#10325#0#PHP" expanded="false" />  
55 - <element signature="e#10331#10615#0#PHP" expanded="false" />  
56 - <element signature="e#10620#11565#0#PHP" expanded="false" />  
57 - <element signature="e#11571#11859#0#PHP" expanded="false" />  
58 - <element signature="e#11864#12803#0#PHP" expanded="false" />  
59 - <element signature="e#12809#13390#0#PHP" expanded="false" />  
60 - <element signature="e#13395#15063#0#PHP" expanded="false" />  
61 - <element signature="e#15069#15525#0#PHP" expanded="false" />  
62 - <element signature="e#15530#17598#0#PHP" expanded="false" />  
63 - <element signature="e#17621#17976#0#PHP" expanded="false" />  
64 - <element signature="e#17982#18695#0#PHP" expanded="false" />  
65 - <element signature="e#18700#20157#0#PHP" expanded="false" />  
66 - <element signature="e#20163#20624#0#PHP" expanded="false" />  
67 - <element signature="e#20629#23756#0#PHP" expanded="false" />  
68 - <element signature="e#23762#24371#0#PHP" expanded="false" />  
69 - <element signature="e#24376#25661#0#PHP" expanded="false" />  
70 - <element signature="e#25667#26024#0#PHP" expanded="false" />  
71 - <element signature="e#26029#27012#0#PHP" expanded="false" />  
72 - <element signature="e#27018#27370#0#PHP" expanded="false" />  
73 - <element signature="e#27375#28484#0#PHP" expanded="false" />  
74 - <element signature="e#28490#28845#0#PHP" expanded="false" />  
75 - <element signature="e#28850#30277#0#PHP" expanded="false" />  
76 - <element signature="e#30283#30707#0#PHP" expanded="false" />  
77 - <element signature="e#30712#31323#0#PHP" expanded="false" />  
78 - <element signature="e#31329#31825#0#PHP" expanded="false" />  
79 - <element signature="e#31830#35192#0#PHP" expanded="false" />  
80 - <element signature="e#32632#33759#0#PHP" expanded="false" />  
81 - <element signature="e#35198#35482#0#PHP" expanded="false" />  
82 - <element signature="e#35487#36123#0#PHP" expanded="false" />  
83 - <element signature="e#36144#36463#0#PHP" expanded="false" />  
84 - <element signature="e#36469#36877#0#PHP" expanded="false" />  
85 - <element signature="e#36883#37642#0#PHP" expanded="false" />  
86 - <element signature="e#37661#38525#0#PHP" expanded="false" />  
87 - <element signature="e#38551#38951#0#PHP" expanded="false" />  
88 - <element signature="e#38974#39547#0#PHP" expanded="false" />  
89 - <element signature="e#39570#40380#0#PHP" expanded="false" />  
90 - <element signature="e#40386#40985#0#PHP" expanded="false" />  
91 - <element signature="e#40990#41954#0#PHP" expanded="false" />  
92 - <element signature="e#41960#42627#0#PHP" expanded="false" />  
93 - <element signature="e#42632#43673#0#PHP" expanded="false" />  
94 - <element signature="e#43679#44342#0#PHP" expanded="false" />  
95 - <element signature="e#44347#45374#0#PHP" expanded="false" />  
96 - <element signature="e#45381#45812#0#PHP" expanded="false" />  
97 - <element signature="e#45817#46395#0#PHP" expanded="false" />  
98 - <element signature="e#46401#46830#0#PHP" expanded="false" />  
99 - <element signature="e#46835#47437#0#PHP" expanded="false" />  
100 - <element signature="e#47443#47870#0#PHP" expanded="false" />  
101 - <element signature="e#47875#48441#0#PHP" expanded="false" /> 37 + <element signature="e#324#941#0#PHP" expanded="false" />
  38 + <element signature="e#947#1011#0#PHP" expanded="false" />
  39 + <element signature="e#1016#1849#0#PHP" expanded="false" />
  40 + <element signature="e#1855#1936#0#PHP" expanded="false" />
  41 + <element signature="e#1941#3993#0#PHP" expanded="false" />
  42 + <element signature="e#4000#4023#0#PHP" expanded="false" />
  43 + <element signature="e#4028#4287#0#PHP" expanded="false" />
  44 + <element signature="e#4294#4343#0#PHP" expanded="false" />
  45 + <element signature="e#4348#4776#0#PHP" expanded="false" />
  46 + <element signature="e#4783#4847#0#PHP" expanded="false" />
  47 + <element signature="e#4852#5588#0#PHP" expanded="false" />
102 </folding> 48 </folding>
103 </state> 49 </state>
104 </provider> 50 </provider>
@@ -124,8 +70,6 @@ @@ -124,8 +70,6 @@
124 <component name="IdeDocumentHistory"> 70 <component name="IdeDocumentHistory">
125 <option name="CHANGED_PATHS"> 71 <option name="CHANGED_PATHS">
126 <list> 72 <list>
127 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payadd.html" />  
128 - <option value="$PROJECT_DIR$/app/admin/controller/MoneyController.php" />  
129 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" /> 73 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" />
130 <option value="$PROJECT_DIR$/app/config.php" /> 74 <option value="$PROJECT_DIR$/app/config.php" />
131 <option value="$PROJECT_DIR$/app/admin/controller/KnowController.php" /> 75 <option value="$PROJECT_DIR$/app/admin/controller/KnowController.php" />
@@ -138,8 +82,6 @@ @@ -138,8 +82,6 @@
138 <option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" /> 82 <option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" />
139 <option value="$PROJECT_DIR$/api/index/model/HomeModel.php" /> 83 <option value="$PROJECT_DIR$/api/index/model/HomeModel.php" />
140 <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" /> 84 <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
141 - <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />  
142 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />  
143 <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" /> 85 <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
144 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" /> 86 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
145 <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" /> 87 <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
@@ -175,6 +117,10 @@ @@ -175,6 +117,10 @@
175 <option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" /> 117 <option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
176 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" /> 118 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
177 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 119 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
  120 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/detail.html" />
  121 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
  122 + <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
  123 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html" />
178 </list> 124 </list>
179 </option> 125 </option>
180 </component> 126 </component>
@@ -192,11 +138,11 @@ @@ -192,11 +138,11 @@
192 <sorting>DEFINITION_ORDER</sorting> 138 <sorting>DEFINITION_ORDER</sorting>
193 </component> 139 </component>
194 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 140 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
195 - <component name="ProjectFrameBounds" extendedState="7">  
196 - <option name="x" value="197" />  
197 - <option name="y" value="-17" /> 141 + <component name="ProjectFrameBounds">
  142 + <option name="x" value="192" />
  143 + <option name="y" value="60" />
198 <option name="width" value="1618" /> 144 <option name="width" value="1618" />
199 - <option name="height" value="1067" /> 145 + <option name="height" value="1061" />
200 </component> 146 </component>
201 <component name="ProjectView"> 147 <component name="ProjectView">
202 <navigator currentView="ProjectPane" proportions="" version="1"> 148 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -213,7 +159,6 @@ @@ -213,7 +159,6 @@
213 <foldersAlwaysOnTop value="true" /> 159 <foldersAlwaysOnTop value="true" />
214 </navigator> 160 </navigator>
215 <panes> 161 <panes>
216 - <pane id="Scratches" />  
217 <pane id="ProjectPane"> 162 <pane id="ProjectPane">
218 <subPane> 163 <subPane>
219 <expand> 164 <expand>
@@ -226,16 +171,30 @@ @@ -226,16 +171,30 @@
226 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 171 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
227 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 172 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
228 </path> 173 </path>
  174 + <path>
  175 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  176 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  177 + <item name="api" 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="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  184 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
  185 + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
  186 + </path>
229 </expand> 187 </expand>
230 <select /> 188 <select />
231 </subPane> 189 </subPane>
232 </pane> 190 </pane>
  191 + <pane id="Scratches" />
233 <pane id="Scope" /> 192 <pane id="Scope" />
234 </panes> 193 </panes>
235 </component> 194 </component>
236 <component name="PropertiesComponent"> 195 <component name="PropertiesComponent">
237 <property name="WebServerToolWindowFactoryState" value="false" /> 196 <property name="WebServerToolWindowFactoryState" value="false" />
238 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../fastadmin/micro" /> 197 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../areial" />
239 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 198 <property name="DefaultHtmlFileTemplate" value="HTML File" />
240 </component> 199 </component>
241 <component name="RecentsManager"> 200 <component name="RecentsManager">
@@ -342,26 +301,28 @@ @@ -342,26 +301,28 @@
342 <workItem from="1576049946357" duration="1233000" /> 301 <workItem from="1576049946357" duration="1233000" />
343 <workItem from="1576056936489" duration="7947000" /> 302 <workItem from="1576056936489" duration="7947000" />
344 <workItem from="1576066696521" duration="5462000" /> 303 <workItem from="1576066696521" duration="5462000" />
345 - <workItem from="1576110549014" duration="8980000" /> 304 + <workItem from="1576110549014" duration="12973000" />
  305 + <workItem from="1576213939457" duration="999000" />
  306 + <workItem from="1576215244804" duration="6841000" />
346 </task> 307 </task>
347 <servers /> 308 <servers />
348 </component> 309 </component>
349 <component name="TimeTrackingManager"> 310 <component name="TimeTrackingManager">
350 - <option name="totallyTimeSpent" value="552255000" /> 311 + <option name="totallyTimeSpent" value="564088000" />
351 </component> 312 </component>
352 <component name="ToolWindowManager"> 313 <component name="ToolWindowManager">
353 - <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> 314 + <frame x="192" y="60" width="1618" height="1061" extended-state="0" />
354 <layout> 315 <layout>
355 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17537314" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 316 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18613607" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
356 <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" /> 317 <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" />
357 <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" /> 318 <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" />
358 <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" /> 319 <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" />
359 - <window_info id="Version Control" 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="false" content_ui="tabs" />  
360 <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" /> 320 <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
  321 + <window_info id="Version Control" 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="false" content_ui="tabs" />
361 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 322 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
362 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25086308" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 323 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25086308" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
363 - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />  
364 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 324 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  325 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
365 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 326 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
366 <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" /> 327 <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
367 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 328 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -403,74 +364,6 @@ @@ -403,74 +364,6 @@
403 <watches-manager /> 364 <watches-manager />
404 </component> 365 </component>
405 <component name="editorHistoryManager"> 366 <component name="editorHistoryManager">
406 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html">  
407 - <provider selected="true" editor-type-id="text-editor">  
408 - <state relative-caret-position="125">  
409 - <caret line="31" column="16" lean-forward="true" selection-start-line="31" selection-start-column="16" selection-end-line="44" selection-end-column="21" />  
410 - </state>  
411 - </provider>  
412 - </entry>  
413 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/index.html">  
414 - <provider selected="true" editor-type-id="text-editor">  
415 - <state relative-caret-position="225">  
416 - <caret line="36" column="20" lean-forward="true" selection-start-line="36" selection-start-column="20" selection-end-line="43" selection-end-column="25" />  
417 - </state>  
418 - </provider>  
419 - </entry>  
420 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html">  
421 - <provider selected="true" editor-type-id="text-editor">  
422 - <state relative-caret-position="750">  
423 - <caret line="30" column="20" lean-forward="true" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />  
424 - </state>  
425 - </provider>  
426 - </entry>  
427 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html">  
428 - <provider selected="true" editor-type-id="text-editor">  
429 - <state relative-caret-position="178">  
430 - <caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />  
431 - </state>  
432 - </provider>  
433 - </entry>  
434 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html">  
435 - <provider selected="true" editor-type-id="text-editor">  
436 - <state relative-caret-position="100">  
437 - <caret line="31" column="12" lean-forward="false" selection-start-line="31" selection-start-column="12" selection-end-line="51" selection-end-column="17" />  
438 - </state>  
439 - </provider>  
440 - </entry>  
441 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html">  
442 - <provider selected="true" editor-type-id="text-editor">  
443 - <state relative-caret-position="78">  
444 - <caret line="24" column="20" lean-forward="true" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" />  
445 - </state>  
446 - </provider>  
447 - </entry>  
448 - <entry file="file://$PROJECT_DIR$/app/admin/controller/SeverController.php">  
449 - <provider selected="true" editor-type-id="text-editor">  
450 - <state relative-caret-position="603">  
451 - <caret line="73" column="27" lean-forward="false" selection-start-line="73" selection-start-column="27" selection-end-line="73" selection-end-column="27" />  
452 - </state>  
453 - </provider>  
454 - </entry>  
455 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">  
456 - <provider selected="true" editor-type-id="text-editor">  
457 - <state relative-caret-position="353">  
458 - <caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />  
459 - </state>  
460 - </provider>  
461 - </entry>  
462 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html">  
463 - <provider selected="true" editor-type-id="text-editor">  
464 - <state relative-caret-position="-6">  
465 - <caret line="26" column="16" lean-forward="true" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />  
466 - </state>  
467 - </provider>  
468 - </entry>  
469 - <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_9.jpg">  
470 - <provider selected="true" editor-type-id="images">  
471 - <state />  
472 - </provider>  
473 - </entry>  
474 <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php"> 367 <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
475 <provider selected="true" editor-type-id="text-editor"> 368 <provider selected="true" editor-type-id="text-editor">
476 <state relative-caret-position="0"> 369 <state relative-caret-position="0">
@@ -478,13 +371,6 @@ @@ -478,13 +371,6 @@
478 </state> 371 </state>
479 </provider> 372 </provider>
480 </entry> 373 </entry>
481 - <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">  
482 - <provider selected="true" editor-type-id="text-editor">  
483 - <state relative-caret-position="0">  
484 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
485 - </state>  
486 - </provider>  
487 - </entry>  
488 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html"> 374 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
489 <provider selected="true" editor-type-id="text-editor"> 375 <provider selected="true" editor-type-id="text-editor">
490 <state relative-caret-position="302"> 376 <state relative-caret-position="302">
@@ -608,7 +494,6 @@ @@ -608,7 +494,6 @@
608 <provider selected="true" editor-type-id="text-editor"> 494 <provider selected="true" editor-type-id="text-editor">
609 <state relative-caret-position="400"> 495 <state relative-caret-position="400">
610 <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" /> 496 <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
611 - <folding />  
612 </state> 497 </state>
613 </provider> 498 </provider>
614 </entry> 499 </entry>
@@ -630,10 +515,6 @@ @@ -630,10 +515,6 @@
630 <provider selected="true" editor-type-id="text-editor"> 515 <provider selected="true" editor-type-id="text-editor">
631 <state relative-caret-position="300"> 516 <state relative-caret-position="300">
632 <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" /> 517 <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
633 - <folding>  
634 - <element signature="e#130#169#0#PHP" expanded="false" />  
635 - <element signature="e#262#1148#0#PHP" expanded="false" />  
636 - </folding>  
637 </state> 518 </state>
638 </provider> 519 </provider>
639 </entry> 520 </entry>
@@ -669,20 +550,6 @@ @@ -669,20 +550,6 @@
669 <provider selected="true" editor-type-id="text-editor"> 550 <provider selected="true" editor-type-id="text-editor">
670 <state relative-caret-position="139"> 551 <state relative-caret-position="139">
671 <caret line="243" column="29" lean-forward="false" selection-start-line="243" selection-start-column="29" selection-end-line="243" selection-end-column="29" /> 552 <caret line="243" column="29" lean-forward="false" selection-start-line="243" selection-start-column="29" selection-end-line="243" selection-end-column="29" />
672 - <folding>  
673 - <element signature="e#4855#5051#0#PHP" expanded="false" />  
674 - <element signature="e#5056#5318#0#PHP" expanded="false" />  
675 - <element signature="e#5324#5779#0#PHP" expanded="false" />  
676 - <element signature="e#5784#6508#0#PHP" expanded="false" />  
677 - <element signature="e#6514#6857#0#PHP" expanded="false" />  
678 - <element signature="e#6862#7343#0#PHP" expanded="false" />  
679 - <element signature="e#7349#7640#0#PHP" expanded="false" />  
680 - <element signature="e#7645#7996#0#PHP" expanded="false" />  
681 - <element signature="e#8002#8355#0#PHP" expanded="false" />  
682 - <element signature="e#8360#8765#0#PHP" expanded="false" />  
683 - <element signature="e#8771#9154#0#PHP" expanded="false" />  
684 - <element signature="e#9159#9826#0#PHP" expanded="false" />  
685 - </folding>  
686 </state> 553 </state>
687 </provider> 554 </provider>
688 </entry> 555 </entry>
@@ -690,9 +557,6 @@ @@ -690,9 +557,6 @@
690 <provider selected="true" editor-type-id="text-editor"> 557 <provider selected="true" editor-type-id="text-editor">
691 <state relative-caret-position="690"> 558 <state relative-caret-position="690">
692 <caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" /> 559 <caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />
693 - <folding>  
694 - <element signature="e#3168#3696#0#PHP" expanded="false" />  
695 - </folding>  
696 </state> 560 </state>
697 </provider> 561 </provider>
698 </entry> 562 </entry>
@@ -700,11 +564,6 @@ @@ -700,11 +564,6 @@
700 <provider selected="true" editor-type-id="text-editor"> 564 <provider selected="true" editor-type-id="text-editor">
701 <state relative-caret-position="425"> 565 <state relative-caret-position="425">
702 <caret line="106" column="125" lean-forward="false" selection-start-line="106" selection-start-column="125" selection-end-line="106" selection-end-column="125" /> 566 <caret line="106" column="125" lean-forward="false" selection-start-line="106" selection-start-column="125" selection-end-line="106" selection-end-column="125" />
703 - <folding>  
704 - <element signature="e#262#867#0#PHP" expanded="false" />  
705 - <element signature="e#2065#2422#0#PHP" expanded="false" />  
706 - <element signature="e#4089#4555#0#PHP" expanded="false" />  
707 - </folding>  
708 </state> 567 </state>
709 </provider> 568 </provider>
710 </entry> 569 </entry>
@@ -712,12 +571,6 @@ @@ -712,12 +571,6 @@
712 <provider selected="true" editor-type-id="text-editor"> 571 <provider selected="true" editor-type-id="text-editor">
713 <state relative-caret-position="0"> 572 <state relative-caret-position="0">
714 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 573 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
715 - <folding>  
716 - <element signature="e#266#1001#0#PHP" expanded="false" />  
717 - <element signature="e#1016#2171#0#PHP" expanded="false" />  
718 - <element signature="e#2186#3928#0#PHP" expanded="false" />  
719 - <element signature="e#3943#4413#0#PHP" expanded="false" />  
720 - </folding>  
721 </state> 574 </state>
722 </provider> 575 </provider>
723 </entry> 576 </entry>
@@ -725,11 +578,6 @@ @@ -725,11 +578,6 @@
725 <provider selected="true" editor-type-id="text-editor"> 578 <provider selected="true" editor-type-id="text-editor">
726 <state relative-caret-position="375"> 579 <state relative-caret-position="375">
727 <caret line="100" column="14" lean-forward="true" selection-start-line="100" selection-start-column="14" selection-end-line="100" selection-end-column="14" /> 580 <caret line="100" column="14" lean-forward="true" selection-start-line="100" selection-start-column="14" selection-end-line="100" selection-end-column="14" />
728 - <folding>  
729 - <element signature="e#265#1638#0#PHP" expanded="false" />  
730 - <element signature="e#1655#3619#0#PHP" expanded="false" />  
731 - <element signature="e#3640#4059#0#PHP" expanded="false" />  
732 - </folding>  
733 </state> 581 </state>
734 </provider> 582 </provider>
735 </entry> 583 </entry>
@@ -737,28 +585,6 @@ @@ -737,28 +585,6 @@
737 <provider selected="true" editor-type-id="text-editor"> 585 <provider selected="true" editor-type-id="text-editor">
738 <state relative-caret-position="506"> 586 <state relative-caret-position="506">
739 <caret line="107" column="14" lean-forward="true" selection-start-line="107" selection-start-column="14" selection-end-line="107" selection-end-column="14" /> 587 <caret line="107" column="14" lean-forward="true" selection-start-line="107" selection-start-column="14" selection-end-line="107" selection-end-column="14" />
740 - <folding>  
741 - <element signature="e#336#608#0#PHP" expanded="false" />  
742 - <element signature="e#614#976#0#PHP" expanded="false" />  
743 - <element signature="e#981#2020#0#PHP" expanded="false" />  
744 - <element signature="e#2026#2263#0#PHP" expanded="false" />  
745 - <element signature="e#3055#3364#0#PHP" expanded="false" />  
746 - <element signature="e#3369#5259#0#PHP" expanded="false" />  
747 - <element signature="e#5267#5746#0#PHP" expanded="false" />  
748 - <element signature="e#5751#6318#0#PHP" expanded="false" />  
749 - <element signature="e#6324#6577#0#PHP" expanded="false" />  
750 - </folding>  
751 - </state>  
752 - </provider>  
753 - </entry>  
754 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
755 - <provider selected="true" editor-type-id="text-editor">  
756 - <state relative-caret-position="1469">  
757 - <caret line="87" column="30" lean-forward="true" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" />  
758 - <folding>  
759 - <element signature="e#947#1011#0#PHP" expanded="false" />  
760 - <element signature="e#1016#1849#0#PHP" expanded="false" />  
761 - </folding>  
762 </state> 588 </state>
763 </provider> 589 </provider>
764 </entry> 590 </entry>
@@ -766,17 +592,6 @@ @@ -766,17 +592,6 @@
766 <provider selected="true" editor-type-id="text-editor"> 592 <provider selected="true" editor-type-id="text-editor">
767 <state relative-caret-position="25"> 593 <state relative-caret-position="25">
768 <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> 594 <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
769 - <folding>  
770 - <element signature="e#305#577#0#PHP" expanded="false" />  
771 - <element signature="e#583#854#0#PHP" expanded="false" />  
772 - <element signature="e#859#1113#0#PHP" expanded="false" />  
773 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
774 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
775 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
776 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
777 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
778 - <element signature="e#3894#4897#0#PHP" expanded="false" />  
779 - </folding>  
780 </state> 595 </state>
781 </provider> 596 </provider>
782 </entry> 597 </entry>
@@ -784,32 +599,6 @@ @@ -784,32 +599,6 @@
784 <provider selected="true" editor-type-id="text-editor"> 599 <provider selected="true" editor-type-id="text-editor">
785 <state relative-caret-position="292"> 600 <state relative-caret-position="292">
786 <caret line="62" column="28" lean-forward="false" selection-start-line="62" selection-start-column="28" selection-end-line="62" selection-end-column="28" /> 601 <caret line="62" column="28" lean-forward="false" selection-start-line="62" selection-start-column="28" selection-end-line="62" selection-end-column="28" />
787 - <folding>  
788 - <element signature="e#411#604#0#PHP" expanded="false" />  
789 - <element signature="e#609#825#0#PHP" expanded="false" />  
790 - <element signature="e#831#1329#0#PHP" expanded="false" />  
791 - <element signature="e#1334#2093#0#PHP" expanded="false" />  
792 - <element signature="e#2099#2317#0#PHP" expanded="false" />  
793 - <element signature="e#2322#2530#0#PHP" expanded="false" />  
794 - <element signature="e#2536#3043#0#PHP" expanded="false" />  
795 - <element signature="e#3048#3566#0#PHP" expanded="false" />  
796 - <element signature="e#3572#4084#0#PHP" expanded="false" />  
797 - <element signature="e#4089#4652#0#PHP" expanded="false" />  
798 - <element signature="e#4658#5248#0#PHP" expanded="false" />  
799 - <element signature="e#5253#6299#0#PHP" expanded="false" />  
800 - <element signature="e#6305#6623#0#PHP" expanded="false" />  
801 - <element signature="e#6628#7004#0#PHP" expanded="false" />  
802 - <element signature="e#7010#7365#0#PHP" expanded="false" />  
803 - <element signature="e#7370#7779#0#PHP" expanded="false" />  
804 - <element signature="e#7785#8170#0#PHP" expanded="false" />  
805 - <element signature="e#8175#8846#0#PHP" expanded="false" />  
806 - <element signature="e#8852#9298#0#PHP" expanded="false" />  
807 - <element signature="e#9303#10154#0#PHP" expanded="false" />  
808 - <element signature="e#10160#10430#0#PHP" expanded="false" />  
809 - <element signature="e#10435#10911#0#PHP" expanded="false" />  
810 - <element signature="e#10917#11547#0#PHP" expanded="false" />  
811 - <element signature="e#11552#13484#0#PHP" expanded="false" />  
812 - </folding>  
813 </state> 602 </state>
814 </provider> 603 </provider>
815 </entry> 604 </entry>
@@ -817,11 +606,6 @@ @@ -817,11 +606,6 @@
817 <provider selected="true" editor-type-id="text-editor"> 606 <provider selected="true" editor-type-id="text-editor">
818 <state relative-caret-position="127"> 607 <state relative-caret-position="127">
819 <caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" /> 608 <caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
820 - <folding>  
821 - <element signature="e#1401#1589#0#PHP" expanded="false" />  
822 - <element signature="e#1594#1885#0#PHP" expanded="false" />  
823 - <element signature="e#1891#2348#0#PHP" expanded="false" />  
824 - </folding>  
825 </state> 609 </state>
826 </provider> 610 </provider>
827 </entry> 611 </entry>
@@ -829,11 +613,6 @@ @@ -829,11 +613,6 @@
829 <provider selected="true" editor-type-id="text-editor"> 613 <provider selected="true" editor-type-id="text-editor">
830 <state relative-caret-position="518"> 614 <state relative-caret-position="518">
831 <caret line="123" column="21" lean-forward="false" selection-start-line="123" selection-start-column="21" selection-end-line="123" selection-end-column="21" /> 615 <caret line="123" column="21" lean-forward="false" selection-start-line="123" selection-start-column="21" selection-end-line="123" selection-end-column="21" />
832 - <folding>  
833 - <element signature="e#275#1168#0#PHP" expanded="false" />  
834 - <element signature="e#1185#2077#0#PHP" expanded="false" />  
835 - <element signature="e#2098#3379#0#PHP" expanded="false" />  
836 - </folding>  
837 </state> 616 </state>
838 </provider> 617 </provider>
839 </entry> 618 </entry>
@@ -841,7 +620,6 @@ @@ -841,7 +620,6 @@
841 <provider selected="true" editor-type-id="text-editor"> 620 <provider selected="true" editor-type-id="text-editor">
842 <state relative-caret-position="475"> 621 <state relative-caret-position="475">
843 <caret line="46" column="41" lean-forward="true" selection-start-line="46" selection-start-column="41" selection-end-line="46" selection-end-column="41" /> 622 <caret line="46" column="41" lean-forward="true" selection-start-line="46" selection-start-column="41" selection-end-line="46" selection-end-column="41" />
844 - <folding />  
845 </state> 623 </state>
846 </provider> 624 </provider>
847 </entry> 625 </entry>
@@ -849,7 +627,6 @@ @@ -849,7 +627,6 @@
849 <provider selected="true" editor-type-id="text-editor"> 627 <provider selected="true" editor-type-id="text-editor">
850 <state relative-caret-position="475"> 628 <state relative-caret-position="475">
851 <caret line="40" column="48" lean-forward="true" selection-start-line="40" selection-start-column="48" selection-end-line="40" selection-end-column="48" /> 629 <caret line="40" column="48" lean-forward="true" selection-start-line="40" selection-start-column="48" selection-end-line="40" selection-end-column="48" />
852 - <folding />  
853 </state> 630 </state>
854 </provider> 631 </provider>
855 </entry> 632 </entry>
@@ -857,73 +634,132 @@ @@ -857,73 +634,132 @@
857 <provider selected="true" editor-type-id="text-editor"> 634 <provider selected="true" editor-type-id="text-editor">
858 <state relative-caret-position="77"> 635 <state relative-caret-position="77">
859 <caret line="421" column="38" lean-forward="false" selection-start-line="421" selection-start-column="38" selection-end-line="421" selection-end-column="38" /> 636 <caret line="421" column="38" lean-forward="false" selection-start-line="421" selection-start-column="38" selection-end-line="421" selection-end-column="38" />
  637 + </state>
  638 + </provider>
  639 + </entry>
  640 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ThemeController.php">
  641 + <provider selected="true" editor-type-id="text-editor">
  642 + <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" />
  644 + </state>
  645 + </provider>
  646 + </entry>
  647 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/detail.html">
  648 + <provider selected="true" editor-type-id="text-editor">
  649 + <state relative-caret-position="400">
  650 + <caret line="18" column="19" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="34" selection-end-column="7" />
  651 + <folding />
  652 + </state>
  653 + </provider>
  654 + </entry>
  655 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/about/index.html">
  656 + <provider selected="true" editor-type-id="text-editor">
  657 + <state relative-caret-position="0">
  658 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  659 + <folding />
  660 + </state>
  661 + </provider>
  662 + </entry>
  663 + <entry file="file://$PROJECT_DIR$/app/admin/controller/AboutController.php">
  664 + <provider selected="true" editor-type-id="text-editor">
  665 + <state relative-caret-position="-225">
  666 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  667 + <folding />
  668 + </state>
  669 + </provider>
  670 + </entry>
  671 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html">
  672 + <provider selected="true" editor-type-id="text-editor">
  673 + <state relative-caret-position="585">
  674 + <caret line="70" column="8" lean-forward="false" selection-start-line="70" selection-start-column="8" selection-end-line="70" selection-end-column="45" />
  675 + <folding />
  676 + </state>
  677 + </provider>
  678 + </entry>
  679 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html">
  680 + <provider selected="true" editor-type-id="text-editor">
  681 + <state relative-caret-position="1074">
  682 + <caret line="45" column="45" lean-forward="false" selection-start-line="45" selection-start-column="45" selection-end-line="45" selection-end-column="45" />
  683 + <folding />
  684 + </state>
  685 + </provider>
  686 + </entry>
  687 + <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
  688 + <provider selected="true" editor-type-id="text-editor">
  689 + <state relative-caret-position="475">
  690 + <caret line="29" column="8" lean-forward="true" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="29" />
  691 + <folding />
  692 + </state>
  693 + </provider>
  694 + </entry>
  695 + <entry file="file://$PROJECT_DIR$/app/user/controller/AdminIndexController.php">
  696 + <provider selected="true" editor-type-id="text-editor">
  697 + <state relative-caret-position="524">
  698 + <caret line="177" column="17" lean-forward="true" selection-start-line="177" selection-start-column="17" selection-end-line="177" selection-end-column="17" />
  699 + <folding>
  700 + <element signature="e#676#1173#0#PHP" expanded="false" />
  701 + <element signature="e#1236#1529#0#PHP" expanded="false" />
  702 + <element signature="e#2304#2598#0#PHP" expanded="false" />
  703 + <element signature="e#2603#3052#0#PHP" expanded="false" />
  704 + <element signature="e#3058#3352#0#PHP" expanded="false" />
  705 + <element signature="e#3357#3666#0#PHP" expanded="false" />
  706 + <element signature="e#3685#3981#0#PHP" expanded="false" />
  707 + <element signature="e#3998#4297#0#PHP" expanded="false" />
  708 + <element signature="e#4314#4673#0#PHP" expanded="false" />
  709 + </folding>
  710 + </state>
  711 + </provider>
  712 + </entry>
  713 + <entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php">
  714 + <provider selected="true" editor-type-id="text-editor">
  715 + <state relative-caret-position="0">
  716 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  717 + <folding>
  718 + <element signature="e#242#346#0#PHP" expanded="false" />
  719 + <element signature="e#351#717#0#PHP" expanded="false" />
  720 + <element signature="e#739#805#0#PHP" expanded="false" />
  721 + </folding>
  722 + </state>
  723 + </provider>
  724 + </entry>
  725 + <entry file="file://$PROJECT_DIR$/app/index/controller/RecycleController.php">
  726 + <provider selected="true" editor-type-id="text-editor">
  727 + <state relative-caret-position="0">
  728 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  729 + <folding>
  730 + <element signature="e#396#1051#0#PHP" expanded="false" />
  731 + <element signature="e#1069#1741#0#PHP" expanded="false" />
  732 + </folding>
  733 + </state>
  734 + </provider>
  735 + </entry>
  736 + <entry file="file://$PROJECT_DIR$/app/index/controller/DoorController.php">
  737 + <provider selected="true" editor-type-id="text-editor">
  738 + <state relative-caret-position="225">
  739 + <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
860 <folding> 740 <folding>
861 - <element signature="e#366#791#0#PHP" expanded="false" />  
862 - <element signature="e#796#1608#0#PHP" expanded="false" />  
863 - <element signature="e#1614#1872#0#PHP" expanded="false" />  
864 - <element signature="e#1877#2260#0#PHP" expanded="false" />  
865 - <element signature="e#2266#2495#0#PHP" expanded="false" />  
866 - <element signature="e#2500#4135#0#PHP" expanded="false" />  
867 - <element signature="e#4141#4381#0#PHP" expanded="false" />  
868 - <element signature="e#4386#4621#0#PHP" expanded="false" />  
869 - <element signature="e#4627#4974#0#PHP" expanded="false" />  
870 - <element signature="e#4979#5425#0#PHP" expanded="false" />  
871 - <element signature="e#5431#5691#0#PHP" expanded="false" />  
872 - <element signature="e#5696#5897#0#PHP" expanded="false" />  
873 - <element signature="e#5903#6165#0#PHP" expanded="false" />  
874 - <element signature="e#6170#6375#0#PHP" expanded="false" />  
875 - <element signature="e#6381#6860#0#PHP" expanded="false" />  
876 - <element signature="e#6865#9088#0#PHP" expanded="false" />  
877 - <element signature="e#9111#9642#0#PHP" expanded="false" />  
878 - <element signature="e#9648#9928#0#PHP" expanded="false" />  
879 - <element signature="e#9933#10325#0#PHP" expanded="false" />  
880 - <element signature="e#10331#10615#0#PHP" expanded="false" />  
881 - <element signature="e#10620#11565#0#PHP" expanded="false" />  
882 - <element signature="e#11571#11859#0#PHP" expanded="false" />  
883 - <element signature="e#11864#12803#0#PHP" expanded="false" />  
884 - <element signature="e#12809#13390#0#PHP" expanded="false" />  
885 - <element signature="e#13395#15063#0#PHP" expanded="false" />  
886 - <element signature="e#15069#15525#0#PHP" expanded="false" />  
887 - <element signature="e#15530#17598#0#PHP" expanded="false" />  
888 - <element signature="e#17621#17976#0#PHP" expanded="false" />  
889 - <element signature="e#17982#18695#0#PHP" expanded="false" />  
890 - <element signature="e#18700#20157#0#PHP" expanded="false" />  
891 - <element signature="e#20163#20624#0#PHP" expanded="false" />  
892 - <element signature="e#20629#23756#0#PHP" expanded="false" />  
893 - <element signature="e#23762#24371#0#PHP" expanded="false" />  
894 - <element signature="e#24376#25661#0#PHP" expanded="false" />  
895 - <element signature="e#25667#26024#0#PHP" expanded="false" />  
896 - <element signature="e#26029#27012#0#PHP" expanded="false" />  
897 - <element signature="e#27018#27370#0#PHP" expanded="false" />  
898 - <element signature="e#27375#28484#0#PHP" expanded="false" />  
899 - <element signature="e#28490#28845#0#PHP" expanded="false" />  
900 - <element signature="e#28850#30277#0#PHP" expanded="false" />  
901 - <element signature="e#30283#30707#0#PHP" expanded="false" />  
902 - <element signature="e#30712#31323#0#PHP" expanded="false" />  
903 - <element signature="e#31329#31825#0#PHP" expanded="false" />  
904 - <element signature="e#31830#35192#0#PHP" expanded="false" />  
905 - <element signature="e#32632#33759#0#PHP" expanded="false" />  
906 - <element signature="e#35198#35482#0#PHP" expanded="false" />  
907 - <element signature="e#35487#36123#0#PHP" expanded="false" />  
908 - <element signature="e#36144#36463#0#PHP" expanded="false" />  
909 - <element signature="e#36469#36877#0#PHP" expanded="false" />  
910 - <element signature="e#36883#37642#0#PHP" expanded="false" />  
911 - <element signature="e#37661#38525#0#PHP" expanded="false" />  
912 - <element signature="e#38551#38951#0#PHP" expanded="false" />  
913 - <element signature="e#38974#39547#0#PHP" expanded="false" />  
914 - <element signature="e#39570#40380#0#PHP" expanded="false" />  
915 - <element signature="e#40386#40985#0#PHP" expanded="false" />  
916 - <element signature="e#40990#41954#0#PHP" expanded="false" />  
917 - <element signature="e#41960#42627#0#PHP" expanded="false" />  
918 - <element signature="e#42632#43673#0#PHP" expanded="false" />  
919 - <element signature="e#43679#44342#0#PHP" expanded="false" />  
920 - <element signature="e#44347#45374#0#PHP" expanded="false" />  
921 - <element signature="e#45381#45812#0#PHP" expanded="false" />  
922 - <element signature="e#45817#46395#0#PHP" expanded="false" />  
923 - <element signature="e#46401#46830#0#PHP" expanded="false" />  
924 - <element signature="e#46835#47437#0#PHP" expanded="false" />  
925 - <element signature="e#47443#47870#0#PHP" expanded="false" />  
926 - <element signature="e#47875#48441#0#PHP" expanded="false" /> 741 + <element signature="e#296#630#0#PHP" expanded="false" />
  742 + <element signature="e#636#1184#0#PHP" expanded="false" />
  743 + </folding>
  744 + </state>
  745 + </provider>
  746 + </entry>
  747 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
  748 + <provider selected="true" editor-type-id="text-editor">
  749 + <state relative-caret-position="399">
  750 + <caret line="66" column="28" lean-forward="false" selection-start-line="66" selection-start-column="28" selection-end-line="66" selection-end-column="28" />
  751 + <folding>
  752 + <element signature="e#324#941#0#PHP" expanded="false" />
  753 + <element signature="e#947#1011#0#PHP" expanded="false" />
  754 + <element signature="e#1016#1849#0#PHP" expanded="false" />
  755 + <element signature="e#1855#1936#0#PHP" expanded="false" />
  756 + <element signature="e#1941#3993#0#PHP" expanded="false" />
  757 + <element signature="e#4000#4023#0#PHP" expanded="false" />
  758 + <element signature="e#4028#4287#0#PHP" expanded="false" />
  759 + <element signature="e#4294#4343#0#PHP" expanded="false" />
  760 + <element signature="e#4348#4776#0#PHP" expanded="false" />
  761 + <element signature="e#4783#4847#0#PHP" expanded="false" />
  762 + <element signature="e#4852#5588#0#PHP" expanded="false" />
927 </folding> 763 </folding>
928 </state> 764 </state>
929 </provider> 765 </provider>
@@ -154,4 +154,32 @@ class AdminIndexController extends AdminBaseController @@ -154,4 +154,32 @@ class AdminIndexController extends AdminBaseController
154 $this->error('数据传入失败！'); 154 $this->error('数据传入失败！');
155 } 155 }
156 } 156 }
  157 +
  158 + //积分详情
  159 + public function detail(){
  160 + $id = input('param.id', 0, 'intval');
  161 + $data = Db::name('integral')
  162 + ->alias('a')
  163 + ->join('user b','a.user_id = b.id')
  164 + ->field('a.*,b.user_nickname')
  165 + ->where('a.user_id',$id)
  166 + ->select();
  167 + $this->assign('list',$data);
  168 + return $this->fetch();
  169 + }
  170 +
  171 + //积分明细
  172 + public function jifendetail(){
  173 + $id = input('param.id', 0, 'intval');
  174 + $data = Db::name('detail')
  175 + ->where('user_id',$id)
  176 + ->order('create_time desc')
  177 + ->paginate(10);
  178 + // 获取分页显示
  179 + $page = $data->render();
  180 + $this->assign('page',$page);
  181 + $this->assign('list',$data);
  182 + return $this->fetch();
  183 +
  184 + }
157 } 185 }
  1 +<include file="public@header"/>
  2 +</head>
  3 +<body>
  4 +<div class="wrap">
  5 + <ul class="nav nav-tabs">
  6 + <li class="active">积分详情</li>
  7 + </ul>
  8 + <form method="post" class="js-ajax-form">
  9 + <table class="table table-hover table-bordered">
  10 + <thead>
  11 + <tr>
  12 + <th>用户昵称</th>
  13 + <th>手机号</th>
  14 + <th>当前积分</th>
  15 + <th>参与次数</th>
  16 + <th>累计积分</th>
  17 + </tr>
  18 + </thead>
  19 + <tbody>
  20 + <foreach name="list" item="vo">
  21 + <tr>
  22 + <td>{$vo.user_nickname}</td>
  23 + <td>{$vo.phone}</td>
  24 + <td>{$vo.now_integral}</td>
  25 + <td>{$vo.num}</td>
  26 + <td>{$vo.add_total}</td>
  27 + </tr>
  28 + </foreach>
  29 + </tbody>
  30 + </table>
  31 + </form>
  32 +</div>
  33 +<script src="__STATIC__/js/admin.js"></script>
  34 +</body>
  35 +</html>
@@ -28,6 +28,8 @@ @@ -28,6 +28,8 @@
28 <th>{:lang('REGISTRATION_TIME')}</th> 28 <th>{:lang('REGISTRATION_TIME')}</th>
29 <th>{:lang('LAST_LOGIN_TIME')}</th> 29 <th>{:lang('LAST_LOGIN_TIME')}</th>
30 <th>{:lang('LAST_LOGIN_IP')}</th> 30 <th>{:lang('LAST_LOGIN_IP')}</th>
  31 + <th>积分详情</th>
  32 + <th>积分明细</th>
31 <th>是否设置为回收员</th> 33 <th>是否设置为回收员</th>
32 </tr> 34 </tr>
33 </thead> 35 </thead>
@@ -48,6 +50,12 @@ @@ -48,6 +50,12 @@
48 <td>{:date('Y-m-d H:i:s',$vo['last_login_time'])}</td> 50 <td>{:date('Y-m-d H:i:s',$vo['last_login_time'])}</td>
49 <td>{$vo.last_login_ip}</td> 51 <td>{$vo.last_login_ip}</td>
50 <td> 52 <td>
  53 + <a href="{:url('adminIndex/detail',array('id'=>$vo['id']))}">积分详情</a>
  54 + </td>
  55 + <td>
  56 + <a href="{:url('adminIndex/jifendetail',array('id'=>$vo['id']))}">积分明细</a>
  57 + </td>
  58 + <td>
51 <if condition="$vo.is_set eq 1"> 59 <if condition="$vo.is_set eq 1">
52 <a href="{:url('adminIndex/cancel',array('id'=>$vo['id']))}" class="js-ajax-dialog-btn" 60 <a href="{:url('adminIndex/cancel',array('id'=>$vo['id']))}" class="js-ajax-dialog-btn"
53 data-msg="您确定要取消设置吗"><span style="color: red">取消设置</span></a> 61 data-msg="您确定要取消设置吗"><span style="color: red">取消设置</span></a>
  1 +<include file="public@header"/>
  2 +</head>
  3 +<body>
  4 +<div class="wrap">
  5 + <ul class="nav nav-tabs">
  6 + <li class="active">积分明细</li>
  7 + </ul>
  8 + <form method="post" class="js-ajax-form">
  9 + <table class="table table-hover table-bordered">
  10 + <thead>
  11 + <tr>
  12 + <th>ID</th>
  13 + <th>类型</th>
  14 + <th>变动金额</th>
  15 + <th>创建时间</th>
  16 + </tr>
  17 + </thead>
  18 + <tbody>
  19 + <foreach name="list" item="vo">
  20 + <tr>
  21 + <td>{$vo.id}</td>
  22 + <if condition="$vo.type == 1">
  23 + <td>充值</td>
  24 + <elseif condition="$vo.type eq 2"/>
  25 + <td>兑换商品</td>
  26 + <elseif condition="$vo.type eq 3"/>
  27 + <td>获得奖励</td>
  28 + <elseif condition="$vo.type eq 4"/>
  29 + <td>提现</td>
  30 + <elseif condition="$vo.type eq 5"/>
  31 + <td>回收商品所得</td>
  32 + <elseif condition="$vo.type eq 6"/>
  33 + <td>家政预约扣除</td>
  34 + <elseif condition="$vo.type eq 7"/>
  35 + <td>取消兑换商品</td>
  36 + <else/>
  37 + <td>取消家政预约</td>
  38 + </if>
  39 +
  40 + <td>{$vo.total}</td>
  41 + <td>{$vo.create_time}</td>
  42 + </tr>
  43 + </foreach>
  44 + </tbody>
  45 + </table>
  46 + <div class="pagination">{$page}</div>
  47 + </form>
  48 +</div>
  49 +<script src="__STATIC__/js/admin.js"></script>
  50 +</body>
  51 +</html>