切换导航条
此项目
正在载入...
登录
郭盛
/
scrap
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
484552e2c628fe832417b6d8b143186edd089f83
1 个父辈
b4e42e90
1 个管道 的构建
通过
耗费 8 秒
修改回收员订单是否评价
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
220 行增加
和
93 行删除
.idea/workspace.xml
api/index/controller/UserController.php
.idea/workspace.xml
查看文件 @
484552e
...
...
@@ -3,6 +3,7 @@
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"0011664b-87e9-41bd-9f37-18792fb15777"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/UserController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/UserController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -24,26 +25,97 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"PointController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/PointController.php"
>
<file
leaf-file-name=
"SubscribeController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"200"
>
<caret
line=
"63"
column=
"16"
lean-forward=
"true"
selection-start-line=
"63"
selection-start-column=
"16"
selection-end-line=
"63"
selection-end-column=
"16"
/>
<state
relative-caret-position=
"621"
>
<caret
line=
"153"
column=
"7"
lean-forward=
"true"
selection-start-line=
"153"
selection-start-column=
"7"
selection-end-line=
"153"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#262#867#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2477#4124#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4139#4605#0#PHP"
expanded=
"false"
/>
<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>
</file>
<file
leaf-file-name=
"add.html"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html"
>
<file
leaf-file-name=
"UserController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"75"
>
<caret
line=
"3"
column=
"0"
lean-forward=
"false"
selection-start-line=
"3"
selection-start-column=
"0"
selection-end-line=
"13"
selection-end-column=
"16"
/>
<folding
/>
<state
relative-caret-position=
"375"
>
<caret
line=
"918"
column=
"13"
lean-forward=
"false"
selection-start-line=
"918"
selection-start-column=
"13"
selection-end-line=
"918"
selection-end-column=
"13"
/>
<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#8984#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9007#9538#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9544#9824#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9829#10221#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10227#10511#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10516#11555#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11561#11849#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11854#12889#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12895#13476#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13481#14869#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14875#15331#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15336#17299#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17322#17677#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17683#18396#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18401#19858#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19864#20325#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20330#23352#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23358#23967#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23972#25257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25263#25620#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25625#26506#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26512#26864#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26869#27947#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27953#28308#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29715#30139#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30144#30755#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30761#31257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31262#34065#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34071#34355#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34360#34996#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35017#35336#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35342#35750#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35756#36515#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36534#37398#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37424#37824#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37847#38420#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38443#39253#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39259#39858#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39863#40827#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40833#41500#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41505#42546#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42552#43215#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43220#44247#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44254#44685#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44690#45268#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45274#45703#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45708#46310#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46316#46743#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46748#47314#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -116,9 +188,9 @@
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/bounty/index.html"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/BountyController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/SubscribeController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/UserController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/PointController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/UserController.php"
/>
</list>
</option>
</component>
...
...
@@ -136,9 +208,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"194"
/>
<option
name=
"y"
value=
"71"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"104"
/>
<option
name=
"y"
value=
"46"
/>
<option
name=
"width"
value=
"1618"
/>
<option
name=
"height"
value=
"1008"
/>
</component>
...
...
@@ -168,56 +240,21 @@
<path>
<item
name=
"scrap"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"scrap"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"ap
p
"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"ap
i
"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"scrap"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"scrap"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"app"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
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=
"app"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
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>
<path>
<item
name=
"scrap"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"scrap"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"scrap"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"scrap"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"scrap"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"scrap"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin_simpleboot3"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"scrap"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"scrap"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin_simpleboot3"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"scrap"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"scrap"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin_simpleboot3"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"point"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
</subPane>
...
...
@@ -227,20 +264,20 @@
</component>
<component
name=
"PropertiesComponent"
>
<property
name=
"WebServerToolWindowFactoryState"
value=
"false"
/>
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$
/../../areial
"
/>
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$"
/>
<property
name=
"DefaultHtmlFileTemplate"
value=
"HTML File"
/>
</component>
<component
name=
"RecentsManager"
>
<key
name=
"MoveFile.RECENT_KEYS"
>
<recent
name=
"D:\htdocs\scrap1\scrap\public\wechat\cert"
/>
<recent
name=
"D:\htdocs\scrap1\scrap\public\static\js"
/>
</key>
<key
name=
"CopyFile.RECENT_KEYS"
>
<recent
name=
"D:\htdocs\scrap1\scrap\api\index\model"
/>
<recent
name=
"D:\htdocs\scrap1\scrap\api\index\controller"
/>
<recent
name=
"D:\htdocs\scrap1\scrap\public\static"
/>
<recent
name=
"D:\htdocs\scrap1\scrap"
/>
</key>
<key
name=
"MoveFile.RECENT_KEYS"
>
<recent
name=
"D:\htdocs\scrap1\scrap\public\wechat\cert"
/>
<recent
name=
"D:\htdocs\scrap1\scrap\public\static\js"
/>
</key>
</component>
<component
name=
"RunDashboard"
>
<option
name=
"ruleStates"
>
...
...
@@ -329,26 +366,30 @@
<workItem
from=
"1575592067577"
duration=
"15900000"
/>
<workItem
from=
"1575615529386"
duration=
"15578000"
/>
<workItem
from=
"1575679046292"
duration=
"1048000"
/>
<workItem
from=
"1575860170691"
duration=
"607000"
/>
<workItem
from=
"1576027263250"
duration=
"3000"
/>
<workItem
from=
"1576049946357"
duration=
"1233000"
/>
<workItem
from=
"1576056936489"
duration=
"1996000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"5
28023
000"
/>
<option
name=
"totallyTimeSpent"
value=
"5
31862
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"1
94"
y=
"71"
width=
"1618"
height=
"1008"
extended-state=
"0
"
/>
<frame
x=
"1
04"
y=
"46"
width=
"1618"
height=
"1008"
extended-state=
"1
"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"
true"
show_stripe_button=
"true"
weight=
"0.23299101
"
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=
"
false"
show_stripe_button=
"true"
weight=
"0.24582799
"
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"
/>
...
...
@@ -679,7 +720,7 @@
<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=
"
tru
e"
/>
<element
signature=
"e#130#169#0#PHP"
expanded=
"
fals
e"
/>
<element
signature=
"e#262#1148#0#PHP"
expanded=
"false"
/>
</folding>
</state>
...
...
@@ -692,20 +733,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"57"
>
<caret
line=
"999"
column=
"28"
lean-forward=
"true"
selection-start-line=
"999"
selection-start-column=
"28"
selection-end-line=
"999"
selection-end-column=
"28"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"661"
>
<caret
line=
"154"
column=
"31"
lean-forward=
"false"
selection-start-line=
"154"
selection-start-column=
"31"
selection-end-line=
"154"
selection-end-column=
"31"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/RecycleController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-89"
>
...
...
@@ -727,25 +754,24 @@
</state>
</provider>
</entry>
<entry
file=
"file://$
PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add
.html"
>
<entry
file=
"file://$
USER_HOME$/Desktop/腾讯地图/public/themes/admin_simpleboot3/admin/dialog/map
.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"75"
>
<caret
line=
"3"
column=
"0"
lean-forward=
"false"
selection-start-line=
"3"
selection-start-column=
"0"
selection-end-line=
"13"
selection-end-column=
"16"
/>
<folding
/>
<state
relative-caret-position=
"250"
>
<caret
line=
"42"
column=
"0"
lean-forward=
"false"
selection-start-line=
"42"
selection-start-column=
"0"
selection-end-line=
"137"
selection-end-column=
"9"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$
USER_HOME$/Desktop/腾讯地图/public/themes/admin_simpleboot3/admin/dialog/map
.html"
>
<entry
file=
"file://$
PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add
.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"250"
>
<caret
line=
"42"
column=
"0"
lean-forward=
"false"
selection-start-line=
"42"
selection-start-column=
"0"
selection-end-line=
"137"
selection-end-column=
"9"
/>
<state
relative-caret-position=
"75"
>
<caret
line=
"3"
column=
"0"
lean-forward=
"false"
selection-start-line=
"3"
selection-start-column=
"0"
selection-end-line=
"13"
selection-end-column=
"16"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/PointController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"200"
>
<caret
line=
"63"
column=
"16"
lean-forward=
"true"
selection-start-line=
"63"
selection-start-column=
"16"
selection-end-line=
"63"
selection-end-column=
"16"
/>
<state
relative-caret-position=
"325"
>
<caret
line=
"60"
column=
"12"
lean-forward=
"false"
selection-start-line=
"60"
selection-start-column=
"12"
selection-end-line=
"62"
selection-end-column=
"31"
/>
<folding>
<element
signature=
"e#262#867#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2477#4124#0#PHP"
expanded=
"false"
/>
...
...
@@ -754,5 +780,96 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"621"
>
<caret
line=
"153"
column=
"7"
lean-forward=
"true"
selection-start-line=
"153"
selection-start-column=
"7"
selection-end-line=
"153"
selection-end-column=
"7"
/>
<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>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"375"
>
<caret
line=
"918"
column=
"13"
lean-forward=
"false"
selection-start-line=
"918"
selection-start-column=
"13"
selection-end-line=
"918"
selection-end-column=
"13"
/>
<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#8984#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9007#9538#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9544#9824#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9829#10221#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10227#10511#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10516#11555#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11561#11849#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11854#12889#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12895#13476#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13481#14869#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14875#15331#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15336#17299#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17322#17677#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17683#18396#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18401#19858#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19864#20325#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20330#23352#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23358#23967#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23972#25257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25263#25620#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25625#26506#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26512#26864#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26869#27947#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27953#28308#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29715#30139#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30144#30755#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30761#31257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31262#34065#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34071#34355#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34360#34996#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35017#35336#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35342#35750#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35756#36515#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36534#37398#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37424#37824#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37847#38420#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38443#39253#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39259#39858#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39863#40827#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40833#41500#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41505#42546#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42552#43215#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43220#44247#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44254#44685#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44690#45268#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45274#45703#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45708#46310#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46316#46743#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46748#47314#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
api/index/controller/UserController.php
查看文件 @
484552e
...
...
@@ -899,15 +899,25 @@ class UserController extends RestBaseController
->
where
(
'user_id'
,
$user_id
)
->
where
(
'status'
,
2
)
->
column
(
'order_id'
);
foreach
(
$list
as
&
$val
){
$val
=
Db
::
name
(
'subscribe'
)
->
where
(
'id'
,
$val
)
->
field
(
'id,num,create_time,sub_time,attr_id,get_integral'
)
->
field
(
'id,
user_id,
num,create_time,sub_time,attr_id,get_integral'
)
->
find
();
$val
[
'create_time'
]
=
date
(
'Y-m-d H:i:s'
,
$val
[
'create_time'
]);
$
val
[
'attr_id'
]
=
explode
(
','
,
$val
[
'attr_id'
]);
$
attr_id
=
explode
(
','
,
$val
[
'attr_id'
]);
$val
[
'goods_name'
]
=
[];
foreach
(
$val
[
'attr_id'
]
as
&
$v
){
$arr
=
Db
::
name
(
'recyclecomment'
)
->
where
(
'user_id'
,
$val
[
'user_id'
])
->
where
(
'recycleorder_id'
,
$val
[
'id'
])
->
find
();
if
(
empty
(
$arr
)){
$val
[
'ping'
]
=
1
;
}
else
{
$val
[
'ping'
]
=
2
;
}
foreach
(
$attr_id
as
&
$v
){
$v1
=
Db
::
name
(
'attr'
)
->
alias
(
'a'
)
->
join
(
'rgoods r'
,
'a.rgoods_id=r.id'
)
...
...
请
注册
或
登录
后发表评论