郭盛 / scrap · 提交

转到一个项目

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

修改废品回收

内嵌 并排对比
正在显示 5 个修改的文件 包含 297 行增加 和 339 行删除
... ... @@ -2,10 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/detail.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
<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" />
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" afterPath="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -27,78 +28,23 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<file leaf-file-name="PayController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="77">
<caret line="421" column="38" lean-forward="false" selection-start-line="421" selection-start-column="38" selection-end-line="421" selection-end-column="38" />
<state relative-caret-position="399">
<caret line="66" column="28" lean-forward="false" selection-start-line="66" selection-start-column="28" selection-end-line="66" selection-end-column="28" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
<element signature="e#1614#1872#0#PHP" expanded="false" />
<element signature="e#1877#2260#0#PHP" expanded="false" />
<element signature="e#2266#2495#0#PHP" expanded="false" />
<element signature="e#2500#4135#0#PHP" expanded="false" />
<element signature="e#4141#4381#0#PHP" expanded="false" />
<element signature="e#4386#4621#0#PHP" expanded="false" />
<element signature="e#4627#4974#0#PHP" expanded="false" />
<element signature="e#4979#5425#0#PHP" expanded="false" />
<element signature="e#5431#5691#0#PHP" expanded="false" />
<element signature="e#5696#5897#0#PHP" expanded="false" />
<element signature="e#5903#6165#0#PHP" expanded="false" />
<element signature="e#6170#6375#0#PHP" expanded="false" />
<element signature="e#6381#6860#0#PHP" expanded="false" />
<element signature="e#6865#9088#0#PHP" expanded="false" />
<element signature="e#9111#9642#0#PHP" expanded="false" />
<element signature="e#9648#9928#0#PHP" expanded="false" />
<element signature="e#9933#10325#0#PHP" expanded="false" />
<element signature="e#10331#10615#0#PHP" expanded="false" />
<element signature="e#10620#11565#0#PHP" expanded="false" />
<element signature="e#11571#11859#0#PHP" expanded="false" />
<element signature="e#11864#12803#0#PHP" expanded="false" />
<element signature="e#12809#13390#0#PHP" expanded="false" />
<element signature="e#13395#15063#0#PHP" expanded="false" />
<element signature="e#15069#15525#0#PHP" expanded="false" />
<element signature="e#15530#17598#0#PHP" expanded="false" />
<element signature="e#17621#17976#0#PHP" expanded="false" />
<element signature="e#17982#18695#0#PHP" expanded="false" />
<element signature="e#18700#20157#0#PHP" expanded="false" />
<element signature="e#20163#20624#0#PHP" expanded="false" />
<element signature="e#20629#23756#0#PHP" expanded="false" />
<element signature="e#23762#24371#0#PHP" expanded="false" />
<element signature="e#24376#25661#0#PHP" expanded="false" />
<element signature="e#25667#26024#0#PHP" expanded="false" />
<element signature="e#26029#27012#0#PHP" expanded="false" />
<element signature="e#27018#27370#0#PHP" expanded="false" />
<element signature="e#27375#28484#0#PHP" expanded="false" />
<element signature="e#28490#28845#0#PHP" expanded="false" />
<element signature="e#28850#30277#0#PHP" expanded="false" />
<element signature="e#30283#30707#0#PHP" expanded="false" />
<element signature="e#30712#31323#0#PHP" expanded="false" />
<element signature="e#31329#31825#0#PHP" expanded="false" />
<element signature="e#31830#35192#0#PHP" expanded="false" />
<element signature="e#32632#33759#0#PHP" expanded="false" />
<element signature="e#35198#35482#0#PHP" expanded="false" />
<element signature="e#35487#36123#0#PHP" expanded="false" />
<element signature="e#36144#36463#0#PHP" expanded="false" />
<element signature="e#36469#36877#0#PHP" expanded="false" />
<element signature="e#36883#37642#0#PHP" expanded="false" />
<element signature="e#37661#38525#0#PHP" expanded="false" />
<element signature="e#38551#38951#0#PHP" expanded="false" />
<element signature="e#38974#39547#0#PHP" expanded="false" />
<element signature="e#39570#40380#0#PHP" expanded="false" />
<element signature="e#40386#40985#0#PHP" expanded="false" />
<element signature="e#40990#41954#0#PHP" expanded="false" />
<element signature="e#41960#42627#0#PHP" expanded="false" />
<element signature="e#42632#43673#0#PHP" expanded="false" />
<element signature="e#43679#44342#0#PHP" expanded="false" />
<element signature="e#44347#45374#0#PHP" expanded="false" />
<element signature="e#45381#45812#0#PHP" expanded="false" />
<element signature="e#45817#46395#0#PHP" expanded="false" />
<element signature="e#46401#46830#0#PHP" expanded="false" />
<element signature="e#46835#47437#0#PHP" expanded="false" />
<element signature="e#47443#47870#0#PHP" expanded="false" />
<element signature="e#47875#48441#0#PHP" expanded="false" />
<element signature="e#324#941#0#PHP" expanded="false" />
<element signature="e#947#1011#0#PHP" expanded="false" />
<element signature="e#1016#1849#0#PHP" expanded="false" />
<element signature="e#1855#1936#0#PHP" expanded="false" />
<element signature="e#1941#3993#0#PHP" expanded="false" />
<element signature="e#4000#4023#0#PHP" expanded="false" />
<element signature="e#4028#4287#0#PHP" expanded="false" />
<element signature="e#4294#4343#0#PHP" expanded="false" />
<element signature="e#4348#4776#0#PHP" expanded="false" />
<element signature="e#4783#4847#0#PHP" expanded="false" />
<element signature="e#4852#5588#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -124,8 +70,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payadd.html" />
<option value="$PROJECT_DIR$/app/admin/controller/MoneyController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" />
<option value="$PROJECT_DIR$/app/config.php" />
<option value="$PROJECT_DIR$/app/admin/controller/KnowController.php" />
... ... @@ -138,8 +82,6 @@
<option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/index/model/HomeModel.php" />
<option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
<option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
... ... @@ -175,6 +117,10 @@
<option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/detail.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
<option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html" />
</list>
</option>
</component>
... ... @@ -192,11 +138,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="197" />
<option name="y" value="-17" />
<component name="ProjectFrameBounds">
<option name="x" value="192" />
<option name="y" value="60" />
<option name="width" value="1618" />
<option name="height" value="1067" />
<option name="height" value="1061" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -213,7 +159,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -226,16 +171,30 @@
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../fastadmin/micro" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../areial" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
... ... @@ -342,26 +301,28 @@
<workItem from="1576049946357" duration="1233000" />
<workItem from="1576056936489" duration="7947000" />
<workItem from="1576066696521" duration="5462000" />
<workItem from="1576110549014" duration="8980000" />
<workItem from="1576110549014" duration="12973000" />
<workItem from="1576213939457" duration="999000" />
<workItem from="1576215244804" duration="6841000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="552255000" />
<option name="totallyTimeSpent" value="564088000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<frame x="192" y="60" width="1618" height="1061" extended-state="0" />
<layout>
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="31" column="16" lean-forward="true" selection-start-line="31" selection-start-column="16" selection-end-line="44" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="36" column="20" lean-forward="true" selection-start-line="36" selection-start-column="20" selection-end-line="43" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="750">
<caret line="30" column="20" lean-forward="true" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178">
<caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="31" column="12" lean-forward="false" selection-start-line="31" selection-start-column="12" selection-end-line="51" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="24" column="20" lean-forward="true" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/SeverController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="603">
<caret line="73" column="27" lean-forward="false" selection-start-line="73" selection-start-column="27" selection-end-line="73" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="353">
<caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6">
<caret line="26" column="16" lean-forward="true" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_9.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -478,13 +371,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="302">
... ... @@ -608,7 +494,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
... ... @@ -630,10 +515,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
<folding>
<element signature="e#130#169#0#PHP" expanded="false" />
<element signature="e#262#1148#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -669,20 +550,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="139">
<caret line="243" column="29" lean-forward="false" selection-start-line="243" selection-start-column="29" selection-end-line="243" selection-end-column="29" />
<folding>
<element signature="e#4855#5051#0#PHP" expanded="false" />
<element signature="e#5056#5318#0#PHP" expanded="false" />
<element signature="e#5324#5779#0#PHP" expanded="false" />
<element signature="e#5784#6508#0#PHP" expanded="false" />
<element signature="e#6514#6857#0#PHP" expanded="false" />
<element signature="e#6862#7343#0#PHP" expanded="false" />
<element signature="e#7349#7640#0#PHP" expanded="false" />
<element signature="e#7645#7996#0#PHP" expanded="false" />
<element signature="e#8002#8355#0#PHP" expanded="false" />
<element signature="e#8360#8765#0#PHP" expanded="false" />
<element signature="e#8771#9154#0#PHP" expanded="false" />
<element signature="e#9159#9826#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -690,9 +557,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="690">
<caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />
<folding>
<element signature="e#3168#3696#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -700,11 +564,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="106" column="125" lean-forward="false" selection-start-line="106" selection-start-column="125" selection-end-line="106" selection-end-column="125" />
<folding>
<element signature="e#262#867#0#PHP" expanded="false" />
<element signature="e#2065#2422#0#PHP" expanded="false" />
<element signature="e#4089#4555#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -712,12 +571,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#266#1001#0#PHP" expanded="false" />
<element signature="e#1016#2171#0#PHP" expanded="false" />
<element signature="e#2186#3928#0#PHP" expanded="false" />
<element signature="e#3943#4413#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -725,11 +578,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="100" column="14" lean-forward="true" selection-start-line="100" selection-start-column="14" selection-end-line="100" selection-end-column="14" />
<folding>
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#1655#3619#0#PHP" expanded="false" />
<element signature="e#3640#4059#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -737,28 +585,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="107" column="14" lean-forward="true" selection-start-line="107" selection-start-column="14" selection-end-line="107" selection-end-column="14" />
<folding>
<element signature="e#336#608#0#PHP" expanded="false" />
<element signature="e#614#976#0#PHP" expanded="false" />
<element signature="e#981#2020#0#PHP" expanded="false" />
<element signature="e#2026#2263#0#PHP" expanded="false" />
<element signature="e#3055#3364#0#PHP" expanded="false" />
<element signature="e#3369#5259#0#PHP" expanded="false" />
<element signature="e#5267#5746#0#PHP" expanded="false" />
<element signature="e#5751#6318#0#PHP" expanded="false" />
<element signature="e#6324#6577#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1469">
<caret line="87" column="30" lean-forward="true" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" />
<folding>
<element signature="e#947#1011#0#PHP" expanded="false" />
<element signature="e#1016#1849#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -766,17 +592,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -784,32 +599,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="292">
<caret line="62" column="28" lean-forward="false" selection-start-line="62" selection-start-column="28" selection-end-line="62" selection-end-column="28" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2093#0#PHP" expanded="false" />
<element signature="e#2099#2317#0#PHP" expanded="false" />
<element signature="e#2322#2530#0#PHP" expanded="false" />
<element signature="e#2536#3043#0#PHP" expanded="false" />
<element signature="e#3048#3566#0#PHP" expanded="false" />
<element signature="e#3572#4084#0#PHP" expanded="false" />
<element signature="e#4089#4652#0#PHP" expanded="false" />
<element signature="e#4658#5248#0#PHP" expanded="false" />
<element signature="e#5253#6299#0#PHP" expanded="false" />
<element signature="e#6305#6623#0#PHP" expanded="false" />
<element signature="e#6628#7004#0#PHP" expanded="false" />
<element signature="e#7010#7365#0#PHP" expanded="false" />
<element signature="e#7370#7779#0#PHP" expanded="false" />
<element signature="e#7785#8170#0#PHP" expanded="false" />
<element signature="e#8175#8846#0#PHP" expanded="false" />
<element signature="e#8852#9298#0#PHP" expanded="false" />
<element signature="e#9303#10154#0#PHP" expanded="false" />
<element signature="e#10160#10430#0#PHP" expanded="false" />
<element signature="e#10435#10911#0#PHP" expanded="false" />
<element signature="e#10917#11547#0#PHP" expanded="false" />
<element signature="e#11552#13484#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -817,11 +606,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127">
<caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
<folding>
<element signature="e#1401#1589#0#PHP" expanded="false" />
<element signature="e#1594#1885#0#PHP" expanded="false" />
<element signature="e#1891#2348#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -829,11 +613,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="518">
<caret line="123" column="21" lean-forward="false" selection-start-line="123" selection-start-column="21" selection-end-line="123" selection-end-column="21" />
<folding>
<element signature="e#275#1168#0#PHP" expanded="false" />
<element signature="e#1185#2077#0#PHP" expanded="false" />
<element signature="e#2098#3379#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -841,7 +620,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="46" column="41" lean-forward="true" selection-start-line="46" selection-start-column="41" selection-end-line="46" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
... ... @@ -849,7 +627,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="40" column="48" lean-forward="true" selection-start-line="40" selection-start-column="48" selection-end-line="40" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
... ... @@ -857,73 +634,132 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="77">
<caret line="421" column="38" lean-forward="false" selection-start-line="421" selection-start-column="38" selection-end-line="421" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ThemeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="18" column="19" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="34" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/about/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/AboutController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-225">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="585">
<caret line="70" column="8" lean-forward="false" selection-start-line="70" selection-start-column="8" selection-end-line="70" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1074">
<caret line="45" column="45" lean-forward="false" selection-start-line="45" selection-start-column="45" selection-end-line="45" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="29" column="8" lean-forward="true" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/AdminIndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="524">
<caret line="177" column="17" lean-forward="true" selection-start-line="177" selection-start-column="17" selection-end-line="177" selection-end-column="17" />
<folding>
<element signature="e#676#1173#0#PHP" expanded="false" />
<element signature="e#1236#1529#0#PHP" expanded="false" />
<element signature="e#2304#2598#0#PHP" expanded="false" />
<element signature="e#2603#3052#0#PHP" expanded="false" />
<element signature="e#3058#3352#0#PHP" expanded="false" />
<element signature="e#3357#3666#0#PHP" expanded="false" />
<element signature="e#3685#3981#0#PHP" expanded="false" />
<element signature="e#3998#4297#0#PHP" expanded="false" />
<element signature="e#4314#4673#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#242#346#0#PHP" expanded="false" />
<element signature="e#351#717#0#PHP" expanded="false" />
<element signature="e#739#805#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#396#1051#0#PHP" expanded="false" />
<element signature="e#1069#1741#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/DoorController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
<element signature="e#1614#1872#0#PHP" expanded="false" />
<element signature="e#1877#2260#0#PHP" expanded="false" />
<element signature="e#2266#2495#0#PHP" expanded="false" />
<element signature="e#2500#4135#0#PHP" expanded="false" />
<element signature="e#4141#4381#0#PHP" expanded="false" />
<element signature="e#4386#4621#0#PHP" expanded="false" />
<element signature="e#4627#4974#0#PHP" expanded="false" />
<element signature="e#4979#5425#0#PHP" expanded="false" />
<element signature="e#5431#5691#0#PHP" expanded="false" />
<element signature="e#5696#5897#0#PHP" expanded="false" />
<element signature="e#5903#6165#0#PHP" expanded="false" />
<element signature="e#6170#6375#0#PHP" expanded="false" />
<element signature="e#6381#6860#0#PHP" expanded="false" />
<element signature="e#6865#9088#0#PHP" expanded="false" />
<element signature="e#9111#9642#0#PHP" expanded="false" />
<element signature="e#9648#9928#0#PHP" expanded="false" />
<element signature="e#9933#10325#0#PHP" expanded="false" />
<element signature="e#10331#10615#0#PHP" expanded="false" />
<element signature="e#10620#11565#0#PHP" expanded="false" />
<element signature="e#11571#11859#0#PHP" expanded="false" />
<element signature="e#11864#12803#0#PHP" expanded="false" />
<element signature="e#12809#13390#0#PHP" expanded="false" />
<element signature="e#13395#15063#0#PHP" expanded="false" />
<element signature="e#15069#15525#0#PHP" expanded="false" />
<element signature="e#15530#17598#0#PHP" expanded="false" />
<element signature="e#17621#17976#0#PHP" expanded="false" />
<element signature="e#17982#18695#0#PHP" expanded="false" />
<element signature="e#18700#20157#0#PHP" expanded="false" />
<element signature="e#20163#20624#0#PHP" expanded="false" />
<element signature="e#20629#23756#0#PHP" expanded="false" />
<element signature="e#23762#24371#0#PHP" expanded="false" />
<element signature="e#24376#25661#0#PHP" expanded="false" />
<element signature="e#25667#26024#0#PHP" expanded="false" />
<element signature="e#26029#27012#0#PHP" expanded="false" />
<element signature="e#27018#27370#0#PHP" expanded="false" />
<element signature="e#27375#28484#0#PHP" expanded="false" />
<element signature="e#28490#28845#0#PHP" expanded="false" />
<element signature="e#28850#30277#0#PHP" expanded="false" />
<element signature="e#30283#30707#0#PHP" expanded="false" />
<element signature="e#30712#31323#0#PHP" expanded="false" />
<element signature="e#31329#31825#0#PHP" expanded="false" />
<element signature="e#31830#35192#0#PHP" expanded="false" />
<element signature="e#32632#33759#0#PHP" expanded="false" />
<element signature="e#35198#35482#0#PHP" expanded="false" />
<element signature="e#35487#36123#0#PHP" expanded="false" />
<element signature="e#36144#36463#0#PHP" expanded="false" />
<element signature="e#36469#36877#0#PHP" expanded="false" />
<element signature="e#36883#37642#0#PHP" expanded="false" />
<element signature="e#37661#38525#0#PHP" expanded="false" />
<element signature="e#38551#38951#0#PHP" expanded="false" />
<element signature="e#38974#39547#0#PHP" expanded="false" />
<element signature="e#39570#40380#0#PHP" expanded="false" />
<element signature="e#40386#40985#0#PHP" expanded="false" />
<element signature="e#40990#41954#0#PHP" expanded="false" />
<element signature="e#41960#42627#0#PHP" expanded="false" />
<element signature="e#42632#43673#0#PHP" expanded="false" />
<element signature="e#43679#44342#0#PHP" expanded="false" />
<element signature="e#44347#45374#0#PHP" expanded="false" />
<element signature="e#45381#45812#0#PHP" expanded="false" />
<element signature="e#45817#46395#0#PHP" expanded="false" />
<element signature="e#46401#46830#0#PHP" expanded="false" />
<element signature="e#46835#47437#0#PHP" expanded="false" />
<element signature="e#47443#47870#0#PHP" expanded="false" />
<element signature="e#47875#48441#0#PHP" expanded="false" />
<element signature="e#296#630#0#PHP" expanded="false" />
<element signature="e#636#1184#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="66" column="28" lean-forward="false" selection-start-line="66" selection-start-column="28" selection-end-line="66" selection-end-column="28" />
<folding>
<element signature="e#324#941#0#PHP" expanded="false" />
<element signature="e#947#1011#0#PHP" expanded="false" />
<element signature="e#1016#1849#0#PHP" expanded="false" />
<element signature="e#1855#1936#0#PHP" expanded="false" />
<element signature="e#1941#3993#0#PHP" expanded="false" />
<element signature="e#4000#4023#0#PHP" expanded="false" />
<element signature="e#4028#4287#0#PHP" expanded="false" />
<element signature="e#4294#4343#0#PHP" expanded="false" />
<element signature="e#4348#4776#0#PHP" expanded="false" />
<element signature="e#4783#4847#0#PHP" expanded="false" />
<element signature="e#4852#5588#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -154,4 +154,32 @@ class AdminIndexController extends AdminBaseController
$this->error('数据传入失败！');
}
}
//积分详情
public function detail(){
$id = input('param.id', 0, 'intval');
$data = Db::name('integral')
->alias('a')
->join('user b','a.user_id = b.id')
->field('a.*,b.user_nickname')
->where('a.user_id',$id)
->select();
$this->assign('list',$data);
return $this->fetch();
}
//积分明细
public function jifendetail(){
$id = input('param.id', 0, 'intval');
$data = Db::name('detail')
->where('user_id',$id)
->order('create_time desc')
->paginate(10);
// 获取分页显示
$page = $data->render();
$this->assign('page',$page);
$this->assign('list',$data);
return $this->fetch();
}
}
... ...
<include file="public@header"/>
</head>
<body>
<div class="wrap">
<ul class="nav nav-tabs">
<li class="active">积分详情</li>
</ul>
<form method="post" class="js-ajax-form">
<table class="table table-hover table-bordered">
<thead>
<tr>
<th>用户昵称</th>
<th>手机号</th>
<th>当前积分</th>
<th>参与次数</th>
<th>累计积分</th>
</tr>
</thead>
<tbody>
<foreach name="list" item="vo">
<tr>
<td>{$vo.user_nickname}</td>
<td>{$vo.phone}</td>
<td>{$vo.now_integral}</td>
<td>{$vo.num}</td>
<td>{$vo.add_total}</td>
</tr>
</foreach>
</tbody>
</table>
</form>
</div>
<script src="__STATIC__/js/admin.js"></script>
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -28,6 +28,8 @@
<th>{:lang('REGISTRATION_TIME')}</th>
<th>{:lang('LAST_LOGIN_TIME')}</th>
<th>{:lang('LAST_LOGIN_IP')}</th>
<th>积分详情</th>
<th>积分明细</th>
<th>是否设置为回收员</th>
</tr>
</thead>
... ... @@ -48,6 +50,12 @@
<td>{:date('Y-m-d H:i:s',$vo['last_login_time'])}</td>
<td>{$vo.last_login_ip}</td>
<td>
<a href="{:url('adminIndex/detail',array('id'=>$vo['id']))}">积分详情</a>
</td>
<td>
<a href="{:url('adminIndex/jifendetail',array('id'=>$vo['id']))}">积分明细</a>
</td>
<td>
<if condition="$vo.is_set eq 1">
<a href="{:url('adminIndex/cancel',array('id'=>$vo['id']))}" class="js-ajax-dialog-btn"
data-msg="您确定要取消设置吗"><span style="color: red">取消设置</span></a>
... ...
<include file="public@header"/>
</head>
<body>
<div class="wrap">
<ul class="nav nav-tabs">
<li class="active">积分明细</li>
</ul>
<form method="post" class="js-ajax-form">
<table class="table table-hover table-bordered">
<thead>
<tr>
<th>ID</th>
<th>类型</th>
<th>变动金额</th>
<th>创建时间</th>
</tr>
</thead>
<tbody>
<foreach name="list" item="vo">
<tr>
<td>{$vo.id}</td>
<if condition="$vo.type == 1">
<td>充值</td>
<elseif condition="$vo.type eq 2"/>
<td>兑换商品</td>
<elseif condition="$vo.type eq 3"/>
<td>获得奖励</td>
<elseif condition="$vo.type eq 4"/>
<td>提现</td>
<elseif condition="$vo.type eq 5"/>
<td>回收商品所得</td>
<elseif condition="$vo.type eq 6"/>
<td>家政预约扣除</td>
<elseif condition="$vo.type eq 7"/>
<td>取消兑换商品</td>
<else/>
<td>取消家政预约</td>
</if>
<td>{$vo.total}</td>
<td>{$vo.create_time}</td>
</tr>
</foreach>
</tbody>
</table>
<div class="pagination">{$page}</div>
</form>
</div>
<script src="__STATIC__/js/admin.js"></script>
</body>
</html>
\ No newline at end of file
... ...