郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 4e909530bc429a71d45bfd0281a78a9f49315ae8 1 个父辈 99f876a2
1 个管道 的构建 通过 耗费 9 秒

后台加入身份判断

内嵌 并排对比
正在显示 4 个修改的文件 包含 248 行增加 和 165 行删除
@@ -3,7 +3,9 @@ @@ -3,7 +3,9 @@
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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" afterPath="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> 6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" afterPath="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
  8 + <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" />
7 </list> 9 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -25,74 +27,64 @@ @@ -25,74 +27,64 @@
25 </component> 27 </component>
26 <component name="FileEditorManager"> 28 <component name="FileEditorManager">
27 <leaf> 29 <leaf>
28 - <file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="false">  
29 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php"> 30 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
  31 + <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
30 <provider selected="true" editor-type-id="text-editor"> 32 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="95">  
32 - <caret line="259" column="5" lean-forward="true" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" /> 33 + <state relative-caret-position="620">
  34 + <caret line="352" column="5" lean-forward="false" selection-start-line="352" selection-start-column="5" selection-end-line="352" selection-end-column="5" />
33 <folding> 35 <folding>
34 - <element signature="e#342#596#0#PHP" expanded="false" />  
35 - <element signature="e#601#886#0#PHP" expanded="false" />  
36 - <element signature="e#892#1227#0#PHP" expanded="false" />  
37 - <element signature="e#1232#1729#0#PHP" expanded="false" />  
38 - <element signature="e#1735#1995#0#PHP" expanded="false" />  
39 - <element signature="e#2000#2289#0#PHP" expanded="false" />  
40 - <element signature="e#2295#2634#0#PHP" expanded="false" />  
41 - <element signature="e#2639#3142#0#PHP" expanded="false" />  
42 - <element signature="e#3148#3364#0#PHP" expanded="false" />  
43 - <element signature="e#3369#3738#0#PHP" expanded="false" />  
44 - <element signature="e#3744#4046#0#PHP" expanded="false" />  
45 - <element signature="e#4051#4450#0#PHP" expanded="false" />  
46 - <element signature="e#4456#4653#0#PHP" expanded="false" />  
47 - <element signature="e#4658#4915#0#PHP" expanded="false" />  
48 - <element signature="e#4921#5117#0#PHP" expanded="false" />  
49 - <element signature="e#5122#5384#0#PHP" expanded="false" />  
50 - <element signature="e#5390#5845#0#PHP" expanded="false" />  
51 - <element signature="e#5850#6416#0#PHP" expanded="false" />  
52 - <element signature="e#6422#6765#0#PHP" expanded="false" />  
53 - <element signature="e#6770#7251#0#PHP" expanded="false" />  
54 - <element signature="e#7257#7548#0#PHP" expanded="false" />  
55 - <element signature="e#7553#7904#0#PHP" expanded="false" />  
56 - <element signature="e#7910#8263#0#PHP" expanded="false" />  
57 - <element signature="e#8268#8673#0#PHP" expanded="false" />  
58 - <element signature="e#8679#9062#0#PHP" expanded="false" />  
59 - <element signature="e#9067#9734#0#PHP" expanded="false" />  
60 - <element signature="e#9740#10184#0#PHP" expanded="false" />  
61 - <element signature="e#10189#11036#0#PHP" expanded="false" />  
62 - <element signature="e#11042#11310#0#PHP" expanded="false" />  
63 - <element signature="e#11315#11787#0#PHP" expanded="false" />  
64 - <element signature="e#11793#12099#0#PHP" expanded="false" />  
65 - <element signature="e#12104#13747#0#PHP" expanded="false" />  
66 - <element signature="e#13768#14087#0#PHP" expanded="false" /> 36 + <element signature="e#1013#1302#0#PHP" expanded="false" />
  37 + <element signature="e#1307#2242#0#PHP" expanded="false" />
  38 + <element signature="e#2248#2538#0#PHP" expanded="false" />
  39 + <element signature="e#2543#2734#0#PHP" expanded="false" />
  40 + <element signature="e#2740#3037#0#PHP" expanded="false" />
  41 + <element signature="e#3042#4380#0#PHP" expanded="false" />
  42 + <element signature="e#4386#4676#0#PHP" expanded="false" />
  43 + <element signature="e#4681#5161#0#PHP" expanded="false" />
  44 + <element signature="e#5167#5464#0#PHP" expanded="false" />
  45 + <element signature="e#5469#7067#0#PHP" expanded="false" />
  46 + <element signature="e#7073#7370#0#PHP" expanded="false" />
  47 + <element signature="e#7375#7582#0#PHP" expanded="false" />
  48 + <element signature="e#7588#7897#0#PHP" expanded="false" />
  49 + <element signature="e#7902#8398#0#PHP" expanded="false" />
  50 + <element signature="e#8404#8695#0#PHP" expanded="false" />
  51 + <element signature="e#8700#9092#0#PHP" expanded="false" />
  52 + <element signature="e#9098#9389#0#PHP" expanded="false" />
  53 + <element signature="e#9394#9861#0#PHP" expanded="false" />
  54 + <element signature="e#9867#10158#0#PHP" expanded="false" />
  55 + <element signature="e#10163#10636#0#PHP" expanded="false" />
67 </folding> 56 </folding>
68 </state> 57 </state>
69 </provider> 58 </provider>
70 </entry> 59 </entry>
71 </file> 60 </file>
72 - <file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="true">  
73 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 61 + <file leaf-file-name="AdminIndexController.php" pinned="false" current-in-tab="false">
  62 + <entry file="file://$PROJECT_DIR$/app/user/controller/AdminIndexController.php">
74 <provider selected="true" editor-type-id="text-editor"> 63 <provider selected="true" editor-type-id="text-editor">
75 - <state relative-caret-position="275">  
76 - <caret line="27" column="25" lean-forward="true" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" /> 64 + <state relative-caret-position="595">
  65 + <caret line="146" column="28" lean-forward="false" selection-start-line="146" selection-start-column="28" selection-end-line="146" selection-end-column="28" />
77 <folding> 66 <folding>
78 - <element signature="e#583#854#0#PHP" expanded="false" />  
79 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
80 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
81 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
82 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
83 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
84 - <element signature="e#3894#4680#0#PHP" expanded="false" /> 67 + <element signature="e#1236#1529#0#PHP" expanded="false" />
  68 + <element signature="e#1534#2298#0#PHP" expanded="false" />
  69 + <element signature="e#2304#2598#0#PHP" expanded="false" />
  70 + <element signature="e#2603#3052#0#PHP" expanded="false" />
  71 + <element signature="e#3058#3352#0#PHP" expanded="false" />
  72 + <element signature="e#3685#3981#0#PHP" expanded="false" />
  73 + <element signature="e#3998#4297#0#PHP" expanded="false" />
85 </folding> 74 </folding>
86 </state> 75 </state>
87 </provider> 76 </provider>
88 </entry> 77 </entry>
89 </file> 78 </file>
90 - <file leaf-file-name="RestBaseController.php" pinned="false" current-in-tab="false">  
91 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php"> 79 + <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
  80 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html">
92 <provider selected="true" editor-type-id="text-editor"> 81 <provider selected="true" editor-type-id="text-editor">
93 - <state relative-caret-position="515">  
94 - <caret line="119" column="42" lean-forward="true" selection-start-line="119" selection-start-column="42" selection-end-line="119" selection-end-column="42" />  
95 - <folding /> 82 + <state relative-caret-position="445">
  83 + <caret line="47" column="74" lean-forward="true" selection-start-line="47" selection-start-column="74" selection-end-line="47" selection-end-column="74" />
  84 + <folding>
  85 + <element signature="n#style#0;n#span#0;n#a#0;n#if#0;n#td#9;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top" expanded="true" />
  86 + <element signature="n#style#0;n#span#0;n#a#1;n#if#0;n#td#9;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top" expanded="true" />
  87 + </folding>
96 </state> 88 </state>
97 </provider> 89 </provider>
98 </entry> 90 </entry>
@@ -117,9 +109,6 @@ @@ -117,9 +109,6 @@
117 <component name="IdeDocumentHistory"> 109 <component name="IdeDocumentHistory">
118 <option name="CHANGED_PATHS"> 110 <option name="CHANGED_PATHS">
119 <list> 111 <list>
120 - <option value="$PROJECT_DIR$/data/conf/database.php" />  
121 - <option value="$PROJECT_DIR$/.gitlab-ci.yml" />  
122 - <option value="$PROJECT_DIR$/app/admin/controller/AboutController.php" />  
123 <option value="$PROJECT_DIR$/public/static/style/base.css" /> 112 <option value="$PROJECT_DIR$/public/static/style/base.css" />
124 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" /> 113 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
125 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/user/index.html" /> 114 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/user/index.html" />
@@ -165,9 +154,12 @@ @@ -165,9 +154,12 @@
165 <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" /> 154 <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
166 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 155 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
167 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 156 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
168 - <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />  
169 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> 157 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
170 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" /> 158 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
  159 + <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
  160 + <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
  161 + <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
  162 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
171 </list> 163 </list>
172 </option> 164 </option>
173 </component> 165 </component>
@@ -186,8 +178,8 @@ @@ -186,8 +178,8 @@
186 </component> 178 </component>
187 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 179 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
188 <component name="ProjectFrameBounds" extendedState="1"> 180 <component name="ProjectFrameBounds" extendedState="1">
189 - <option name="x" value="235" />  
190 - <option name="y" value="57" /> 181 + <option name="x" value="309" />
  182 + <option name="y" value="60" />
191 <option name="width" value="1582" /> 183 <option name="width" value="1582" />
192 <option name="height" value="982" /> 184 <option name="height" value="982" />
193 </component> 185 </component>
@@ -217,21 +209,56 @@ @@ -217,21 +209,56 @@
217 <path> 209 <path>
218 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 210 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
219 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 211 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
220 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 212 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
221 </path> 213 </path>
222 <path> 214 <path>
223 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 215 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
224 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 216 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
225 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
226 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 217 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
  218 + <item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
227 </path> 219 </path>
228 <path> 220 <path>
229 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 221 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
230 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 222 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
231 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
232 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 223 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
  224 + <item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
233 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 225 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
234 </path> 226 </path>
  227 + <path>
  228 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  229 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  230 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  231 + </path>
  232 + <path>
  233 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  234 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  235 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  236 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  237 + </path>
  238 + <path>
  239 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  240 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  241 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  242 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  243 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  244 + </path>
  245 + <path>
  246 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  247 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  248 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  249 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  250 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  251 + <item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
  252 + </path>
  253 + <path>
  254 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  255 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  256 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  257 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  258 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  259 + <item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
  260 + <item name="admin_index" type="2a2b976b:PhpTreeStructureProvider$1" />
  261 + </path>
235 </expand> 262 </expand>
236 <select /> 263 <select />
237 </subPane> 264 </subPane>
@@ -325,15 +352,15 @@ @@ -325,15 +352,15 @@
325 <workItem from="1574837405404" duration="1203000" /> 352 <workItem from="1574837405404" duration="1203000" />
326 <workItem from="1574903328460" duration="15512000" /> 353 <workItem from="1574903328460" duration="15512000" />
327 <workItem from="1574930017327" duration="7716000" /> 354 <workItem from="1574930017327" duration="7716000" />
328 - <workItem from="1574986868818" duration="2791000" /> 355 + <workItem from="1574986868818" duration="8975000" />
329 </task> 356 </task>
330 <servers /> 357 <servers />
331 </component> 358 </component>
332 <component name="TimeTrackingManager"> 359 <component name="TimeTrackingManager">
333 - <option name="totallyTimeSpent" value="358499000" /> 360 + <option name="totallyTimeSpent" value="364683000" />
334 </component> 361 </component>
335 <component name="ToolWindowManager"> 362 <component name="ToolWindowManager">
336 - <frame x="235" y="57" width="1582" height="982" extended-state="1" /> 363 + <frame x="309" y="60" width="1582" height="982" extended-state="1" />
337 <editor active="true" /> 364 <editor active="true" />
338 <layout> 365 <layout>
339 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18528253" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 366 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18528253" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -387,41 +414,6 @@ @@ -387,41 +414,6 @@
387 <watches-manager /> 414 <watches-manager />
388 </component> 415 </component>
389 <component name="editorHistoryManager"> 416 <component name="editorHistoryManager">
390 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html">  
391 - <provider selected="true" editor-type-id="text-editor">  
392 - <state relative-caret-position="200">  
393 - <caret line="20" column="77" lean-forward="true" selection-start-line="20" selection-start-column="77" selection-end-line="20" selection-end-column="77" />  
394 - </state>  
395 - </provider>  
396 - </entry>  
397 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payadd.html">  
398 - <provider selected="true" editor-type-id="text-editor">  
399 - <state relative-caret-position="225">  
400 - <caret line="9" column="44" lean-forward="false" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="44" />  
401 - </state>  
402 - </provider>  
403 - </entry>  
404 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/pay.html">  
405 - <provider selected="true" editor-type-id="text-editor">  
406 - <state relative-caret-position="439">  
407 - <caret line="24" column="43" lean-forward="false" selection-start-line="24" selection-start-column="43" selection-end-line="24" selection-end-column="43" />  
408 - </state>  
409 - </provider>  
410 - </entry>  
411 - <entry file="file://$PROJECT_DIR$/app/admin/controller/MoneyController.php">  
412 - <provider selected="true" editor-type-id="text-editor">  
413 - <state relative-caret-position="625">  
414 - <caret line="145" column="39" lean-forward="false" selection-start-line="145" selection-start-column="39" selection-end-line="145" selection-end-column="39" />  
415 - </state>  
416 - </provider>  
417 - </entry>  
418 - <entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php">  
419 - <provider selected="true" editor-type-id="text-editor">  
420 - <state relative-caret-position="325">  
421 - <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />  
422 - </state>  
423 - </provider>  
424 - </entry>  
425 <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Foundation/Application.php"> 417 <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Foundation/Application.php">
426 <provider selected="true" editor-type-id="text-editor"> 418 <provider selected="true" editor-type-id="text-editor">
427 <state relative-caret-position="304"> 419 <state relative-caret-position="304">
@@ -738,38 +730,6 @@ @@ -738,38 +730,6 @@
738 </state> 730 </state>
739 </provider> 731 </provider>
740 </entry> 732 </entry>
741 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">  
742 - <provider selected="true" editor-type-id="text-editor">  
743 - <state relative-caret-position="149">  
744 - <caret line="562" column="58" lean-forward="true" selection-start-line="562" selection-start-column="58" selection-end-line="562" selection-end-column="58" />  
745 - <folding>  
746 - <element signature="e#345#694#0#PHP" expanded="false" />  
747 - <element signature="e#699#1464#0#PHP" expanded="false" />  
748 - <element signature="e#1470#1699#0#PHP" expanded="false" />  
749 - <element signature="e#3335#3682#0#PHP" expanded="false" />  
750 - <element signature="e#3687#4133#0#PHP" expanded="false" />  
751 - <element signature="e#4139#4399#0#PHP" expanded="false" />  
752 - <element signature="e#4404#4605#0#PHP" expanded="false" />  
753 - <element signature="e#4611#4873#0#PHP" expanded="false" />  
754 - <element signature="e#4878#5083#0#PHP" expanded="false" />  
755 - <element signature="e#5089#5531#0#PHP" expanded="false" />  
756 - <element signature="e#5536#6764#0#PHP" expanded="false" />  
757 - <element signature="e#6787#7332#0#PHP" expanded="false" />  
758 - <element signature="e#7338#7619#0#PHP" expanded="false" />  
759 - <element signature="e#7624#8016#0#PHP" expanded="false" />  
760 - <element signature="e#8022#8574#0#PHP" expanded="false" />  
761 - <element signature="e#8579#9937#0#PHP" expanded="false" />  
762 - <element signature="e#9943#10400#0#PHP" expanded="false" />  
763 - <element signature="e#10405#11668#0#PHP" expanded="false" />  
764 - <element signature="e#11691#12043#0#PHP" expanded="false" />  
765 - <element signature="e#12049#12733#0#PHP" expanded="false" />  
766 - <element signature="e#12738#13997#0#PHP" expanded="false" />  
767 - <element signature="e#14003#14465#0#PHP" expanded="false" />  
768 - <element signature="e#14470#16675#0#PHP" expanded="false" />  
769 - </folding>  
770 - </state>  
771 - </provider>  
772 - </entry>  
773 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 733 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
774 <provider selected="true" editor-type-id="text-editor"> 734 <provider selected="true" editor-type-id="text-editor">
775 <state relative-caret-position="618"> 735 <state relative-caret-position="618">
@@ -833,10 +793,34 @@ @@ -833,10 +793,34 @@
833 </state> 793 </state>
834 </provider> 794 </provider>
835 </entry> 795 </entry>
  796 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
  797 + <provider selected="true" editor-type-id="text-editor">
  798 + <state relative-caret-position="515">
  799 + <caret line="119" column="42" lean-forward="true" selection-start-line="119" selection-start-column="42" selection-end-line="119" selection-end-column="42" />
  800 + <folding />
  801 + </state>
  802 + </provider>
  803 + </entry>
  804 + <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
  805 + <provider selected="true" editor-type-id="text-editor">
  806 + <state relative-caret-position="-50">
  807 + <caret line="32" column="7" lean-forward="false" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
  808 + <folding>
  809 + <element signature="e#305#577#0#PHP" expanded="false" />
  810 + <element signature="e#1119#1594#0#PHP" expanded="false" />
  811 + <element signature="e#1599#2490#0#PHP" expanded="false" />
  812 + <element signature="e#2497#2911#0#PHP" expanded="false" />
  813 + <element signature="e#2916#3386#0#PHP" expanded="false" />
  814 + <element signature="e#3393#3889#0#PHP" expanded="false" />
  815 + <element signature="e#3894#4680#0#PHP" expanded="false" />
  816 + </folding>
  817 + </state>
  818 + </provider>
  819 + </entry>
836 <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php"> 820 <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
837 <provider selected="true" editor-type-id="text-editor"> 821 <provider selected="true" editor-type-id="text-editor">
838 <state relative-caret-position="95"> 822 <state relative-caret-position="95">
839 - <caret line="259" column="5" lean-forward="true" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" /> 823 + <caret line="259" column="5" lean-forward="false" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" />
840 <folding> 824 <folding>
841 <element signature="e#342#596#0#PHP" expanded="false" /> 825 <element signature="e#342#596#0#PHP" expanded="false" />
842 <element signature="e#601#886#0#PHP" expanded="false" /> 826 <element signature="e#601#886#0#PHP" expanded="false" />
@@ -875,26 +859,108 @@ @@ -875,26 +859,108 @@
875 </state> 859 </state>
876 </provider> 860 </provider>
877 </entry> 861 </entry>
878 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php"> 862 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
879 <provider selected="true" editor-type-id="text-editor"> 863 <provider selected="true" editor-type-id="text-editor">
880 - <state relative-caret-position="515">  
881 - <caret line="119" column="42" lean-forward="true" selection-start-line="119" selection-start-column="42" selection-end-line="119" selection-end-column="42" /> 864 + <state relative-caret-position="450">
  865 + <caret line="84" column="22" lean-forward="true" selection-start-line="84" selection-start-column="22" selection-end-line="84" selection-end-column="22" />
  866 + <folding>
  867 + <element signature="e#345#694#0#PHP" expanded="false" />
  868 + <element signature="e#699#1464#0#PHP" expanded="false" />
  869 + <element signature="e#1470#1699#0#PHP" expanded="false" />
  870 + <element signature="e#3343#3690#0#PHP" expanded="false" />
  871 + <element signature="e#3695#4141#0#PHP" expanded="false" />
  872 + <element signature="e#4147#4407#0#PHP" expanded="false" />
  873 + <element signature="e#4412#4613#0#PHP" expanded="false" />
  874 + <element signature="e#4619#4881#0#PHP" expanded="false" />
  875 + <element signature="e#4886#5091#0#PHP" expanded="false" />
  876 + <element signature="e#5097#5539#0#PHP" expanded="false" />
  877 + <element signature="e#5544#6772#0#PHP" expanded="false" />
  878 + <element signature="e#6795#7340#0#PHP" expanded="false" />
  879 + <element signature="e#7346#7627#0#PHP" expanded="false" />
  880 + <element signature="e#7632#8024#0#PHP" expanded="false" />
  881 + <element signature="e#8030#8582#0#PHP" expanded="false" />
  882 + <element signature="e#8587#9945#0#PHP" expanded="false" />
  883 + <element signature="e#9951#10408#0#PHP" expanded="false" />
  884 + <element signature="e#10413#11676#0#PHP" expanded="false" />
  885 + <element signature="e#11699#12051#0#PHP" expanded="false" />
  886 + <element signature="e#12057#12741#0#PHP" expanded="false" />
  887 + <element signature="e#12746#14005#0#PHP" expanded="false" />
  888 + <element signature="e#14011#14473#0#PHP" expanded="false" />
  889 + <element signature="e#14478#16683#0#PHP" expanded="false" />
  890 + <element signature="e#16689#17298#0#PHP" expanded="false" />
  891 + <element signature="e#17303#18636#0#PHP" expanded="false" />
  892 + </folding>
  893 + </state>
  894 + </provider>
  895 + </entry>
  896 + <entry file="jar://$APPLICATION_HOME_DIR$/lib/phpstorm.jar!/resources/html5-schema/html5/tables.rnc">
  897 + <provider selected="true" editor-type-id="text-editor">
  898 + <state relative-caret-position="273">
  899 + <caret line="123" column="16" lean-forward="false" selection-start-line="123" selection-start-column="16" selection-end-line="123" selection-end-column="16" />
882 <folding /> 900 <folding />
883 </state> 901 </state>
884 </provider> 902 </provider>
885 </entry> 903 </entry>
886 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 904 + <entry file="file://$PROJECT_DIR$/app/admin/controller/IndexController.php">
887 <provider selected="true" editor-type-id="text-editor"> 905 <provider selected="true" editor-type-id="text-editor">
888 - <state relative-caret-position="275">  
889 - <caret line="27" column="25" lean-forward="true" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" /> 906 + <state relative-caret-position="0">
  907 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  908 + <folding />
  909 + </state>
  910 + </provider>
  911 + </entry>
  912 + <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
  913 + <provider selected="true" editor-type-id="text-editor">
  914 + <state relative-caret-position="620">
  915 + <caret line="352" column="5" lean-forward="false" selection-start-line="352" selection-start-column="5" selection-end-line="352" selection-end-column="5" />
890 <folding> 916 <folding>
891 - <element signature="e#583#854#0#PHP" expanded="false" />  
892 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
893 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
894 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
895 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
896 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
897 - <element signature="e#3894#4680#0#PHP" expanded="false" /> 917 + <element signature="e#1013#1302#0#PHP" expanded="false" />
  918 + <element signature="e#1307#2242#0#PHP" expanded="false" />
  919 + <element signature="e#2248#2538#0#PHP" expanded="false" />
  920 + <element signature="e#2543#2734#0#PHP" expanded="false" />
  921 + <element signature="e#2740#3037#0#PHP" expanded="false" />
  922 + <element signature="e#3042#4380#0#PHP" expanded="false" />
  923 + <element signature="e#4386#4676#0#PHP" expanded="false" />
  924 + <element signature="e#4681#5161#0#PHP" expanded="false" />
  925 + <element signature="e#5167#5464#0#PHP" expanded="false" />
  926 + <element signature="e#5469#7067#0#PHP" expanded="false" />
  927 + <element signature="e#7073#7370#0#PHP" expanded="false" />
  928 + <element signature="e#7375#7582#0#PHP" expanded="false" />
  929 + <element signature="e#7588#7897#0#PHP" expanded="false" />
  930 + <element signature="e#7902#8398#0#PHP" expanded="false" />
  931 + <element signature="e#8404#8695#0#PHP" expanded="false" />
  932 + <element signature="e#8700#9092#0#PHP" expanded="false" />
  933 + <element signature="e#9098#9389#0#PHP" expanded="false" />
  934 + <element signature="e#9394#9861#0#PHP" expanded="false" />
  935 + <element signature="e#9867#10158#0#PHP" expanded="false" />
  936 + <element signature="e#10163#10636#0#PHP" expanded="false" />
  937 + </folding>
  938 + </state>
  939 + </provider>
  940 + </entry>
  941 + <entry file="file://$PROJECT_DIR$/app/user/controller/AdminIndexController.php">
  942 + <provider selected="true" editor-type-id="text-editor">
  943 + <state relative-caret-position="595">
  944 + <caret line="146" column="28" lean-forward="false" selection-start-line="146" selection-start-column="28" selection-end-line="146" selection-end-column="28" />
  945 + <folding>
  946 + <element signature="e#1236#1529#0#PHP" expanded="false" />
  947 + <element signature="e#1534#2298#0#PHP" expanded="false" />
  948 + <element signature="e#2304#2598#0#PHP" expanded="false" />
  949 + <element signature="e#2603#3052#0#PHP" expanded="false" />
  950 + <element signature="e#3058#3352#0#PHP" expanded="false" />
  951 + <element signature="e#3685#3981#0#PHP" expanded="false" />
  952 + <element signature="e#3998#4297#0#PHP" expanded="false" />
  953 + </folding>
  954 + </state>
  955 + </provider>
  956 + </entry>
  957 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html">
  958 + <provider selected="true" editor-type-id="text-editor">
  959 + <state relative-caret-position="445">
  960 + <caret line="47" column="74" lean-forward="true" selection-start-line="47" selection-start-column="74" selection-end-line="47" selection-end-column="74" />
  961 + <folding>
  962 + <element signature="n#style#0;n#span#0;n#a#0;n#if#0;n#td#9;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top" expanded="true" />
  963 + <element signature="n#style#0;n#span#0;n#a#1;n#if#0;n#td#9;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top" expanded="true" />
898 </folding> 964 </folding>
899 </state> 965 </state>
900 </provider> 966 </provider>
@@ -83,7 +83,7 @@ class UserController extends RestBaseController @@ -83,7 +83,7 @@ class UserController extends RestBaseController
83 $number = generateCode(); 83 $number = generateCode();
84 //发送验证码 84 //发送验证码
85 $data = array( 85 $data = array(
86 - 'content' => "您的验证码是：" . $number."十分钟之内有效",//短信内容 86 + 'content' => "【垃圾回收变现】您的验证码是：" . $number."十分钟之内有效",//短信内容
87 'mobile' => $phone,//手机号码 87 'mobile' => $phone,//手机号码
88 'productid' => '676767',//产品id 88 'productid' => '676767',//产品id
89 'xh' => ''//小号 89 'xh' => ''//小号
@@ -130,4 +130,28 @@ class AdminIndexController extends AdminBaseController @@ -130,4 +130,28 @@ class AdminIndexController extends AdminBaseController
130 $this->error('数据传入失败！'); 130 $this->error('数据传入失败！');
131 } 131 }
132 } 132 }
  133 +
  134 + //设置为回收员
  135 + public function set()
  136 + {
  137 + $id = input('param.id', 0, 'intval');
  138 + if ($id) {
  139 + Db::name("user")->where(["id" => $id, "user_type" => 2])->setField('is_set', 1);
  140 + $this->success("设置成功！", '');
  141 + } else {
  142 + $this->error('数据传入失败！');
  143 + }
  144 + }
  145 +
  146 + //取消设置
  147 + public function cancel()
  148 + {
  149 + $id = input('param.id', 0, 'intval');
  150 + if ($id) {
  151 + Db::name("user")->where(["id" => $id, "user_type" => 2])->setField('is_set', 0);
  152 + $this->success("设置成功！", '');
  153 + } else {
  154 + $this->error('数据传入失败！');
  155 + }
  156 + }
133 } 157 }
@@ -28,8 +28,7 @@ @@ -28,8 +28,7 @@
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>{:lang('STATUS')}</th>  
32 - <th>{:lang('ACTIONS')}</th> 31 + <th>是否设置为回收员</th>
33 </tr> 32 </tr>
34 </thead> 33 </thead>
35 <tbody> 34 <tbody>
@@ -48,20 +47,14 @@ @@ -48,20 +47,14 @@
48 <td>{:date('Y-m-d H:i:s',$vo['create_time'])}</td> 47 <td>{:date('Y-m-d H:i:s',$vo['create_time'])}</td>
49 <td>{:date('Y-m-d H:i:s',$vo['last_login_time'])}</td> 48 <td>{:date('Y-m-d H:i:s',$vo['last_login_time'])}</td>
50 <td>{$vo.last_login_ip}</td> 49 <td>{$vo.last_login_ip}</td>
51 - <td>{$user_statuses[$vo['user_status']]}</td>  
52 <td> 50 <td>
53 - <neq name="vo.id" value="1">  
54 - <empty name="vo.user_status">  
55 - <a href="{:url('adminIndex/cancelban',array('id'=>$vo['id']))}"  
56 - class="js-ajax-dialog-btn"  
57 - data-msg="{:lang('ACTIVATE_USER_CONFIRM_MESSAGE')}">{:lang('ACTIVATE_USER')}</a>  
58 - <else/>  
59 - <a href="{:url('adminIndex/ban',array('id'=>$vo['id']))}" class="js-ajax-dialog-btn"  
60 - data-msg="{:lang('BLOCK_USER_CONFIRM_MESSAGE')}">{:lang('BLOCK_USER')}</a>  
61 - </empty>  
62 - <else/>  
63 - <a style="color: #ccc;">{:lang('BLOCK_USER')}</a>  
64 - </neq> 51 + <if condition="$vo.is_set eq 1">
  52 + <a href="{:url('adminIndex/cancel',array('id'=>$vo['id']))}" class="js-ajax-dialog-btn"
  53 + data-msg="您确定要取消设置吗"><span style="color: red">取消设置</span></a>
  54 + <else />
  55 + <a href="{:url('adminIndex/set',array('id'=>$vo['id']))}" class="js-ajax-dialog-btn"
  56 + data-msg="您确定要设置吗"><span style="color: green">设置</span></a>
  57 + </if>
65 </td> 58 </td>
66 </tr> 59 </tr>
67 </foreach> 60 </foreach>