切换导航条
此项目
正在载入...
登录
郭盛
/
scrap
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
741aba5ccdc7839c03767625a88921123e899a23
1 个父辈
dc2377fb
1 个管道 的构建
通过
耗费 1 秒
添加后台奖励金配置
变更
4
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
213 行增加
和
179 行删除
.idea/workspace.xml
api/index/controller/UserController.php
app/admin/controller/FeeController.php
data/lang/zh-cn/admin_menu.php
.idea/workspace.xml
查看文件 @
741aba5
...
...
@@ -3,7 +3,9 @@
<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/PayController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/PayController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/UserController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/UserController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/app/admin/controller/FeeController.php"
afterPath=
"$PROJECT_DIR$/app/admin/controller/FeeController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php"
afterPath=
"$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -25,45 +27,24 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"OrderController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OrderController.php"
>
<file
leaf-file-name=
"BountyController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/BountyController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"250"
>
<caret
line=
"152"
column=
"51"
lean-forward=
"true"
selection-start-line=
"152"
selection-start-column=
"51"
selection-end-line=
"152"
selection-end-column=
"51"
/>
<state
relative-caret-position=
"111"
>
<caret
line=
"22"
column=
"43"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"43"
selection-end-line=
"22"
selection-end-column=
"43"
/>
<folding>
<element
signature=
"e#131#162#0#PHP"
expanded=
"true"
/>
<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#2268#3059#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3065#3374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5277#5756#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5761#6328#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#130#169#0#PHP"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"PayController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/PayController.php"
>
<file
leaf-file-name=
"index.html"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/bounty/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"654"
>
<caret
line=
"157"
column=
"33"
lean-forward=
"false"
selection-start-line=
"157"
selection-start-column=
"33"
selection-end-line=
"157"
selection-end-column=
"33"
/>
<folding>
<element
signature=
"e#40#78#0#PHP"
expanded=
"true"
/>
<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
relative-caret-position=
"250"
>
<caret
line=
"10"
column=
"9"
lean-forward=
"true"
selection-start-line=
"10"
selection-start-column=
"9"
selection-end-line=
"10"
selection-end-column=
"9"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -88,9 +69,6 @@
<component
name=
"IdeDocumentHistory"
>
<option
name=
"CHANGED_PATHS"
>
<list>
<option
value=
"$PROJECT_DIR$/api/index/model/ShoppicModel.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/BuildController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/index.html"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/add.html"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/edit.html"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/pay.html"
/>
...
...
@@ -134,11 +112,14 @@
<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$/simplewind/cmf/common.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/UserController.php"
/>
<option
value=
"$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OrderController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/RecycleController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/PayController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/UserController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/FeeController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/bounty/index.html"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/BountyController.php"
/>
</list>
</option>
</component>
...
...
@@ -157,10 +138,10 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"234"
/>
<option
name=
"y"
value=
"79"
/>
<option
name=
"x"
value=
"327"
/>
<option
name=
"y"
value=
"114"
/>
<option
name=
"width"
value=
"1618"
/>
<option
name=
"height"
value=
"10
16
"
/>
<option
name=
"height"
value=
"10
23
"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -188,21 +169,65 @@
<path>
<item
name=
"scrap"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"scrap"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"ap
i
"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"ap
p
"
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=
"app"
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=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"index"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"app"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
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=
"bounty"
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=
"fee"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
</subPane>
...
...
@@ -312,15 +337,15 @@
<workItem
from=
"1575527294268"
duration=
"10705000"
/>
<workItem
from=
"1575543830603"
duration=
"2980000"
/>
<workItem
from=
"1575592067577"
duration=
"15900000"
/>
<workItem
from=
"1575615529386"
duration=
"
9701
000"
/>
<workItem
from=
"1575615529386"
duration=
"
10434
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"521
098
000"
/>
<option
name=
"totallyTimeSpent"
value=
"521
831
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
234"
y=
"79"
width=
"1618"
height=
"1016
"
extended-state=
"0"
/>
<frame
x=
"
327"
y=
"114"
width=
"1618"
height=
"1023
"
extended-state=
"0"
/>
<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.22978178"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -374,34 +399,6 @@
<watches-manager
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"150"
>
<caret
line=
"42"
column=
"43"
lean-forward=
"true"
selection-start-line=
"42"
selection-start-column=
"43"
selection-end-line=
"42"
selection-end-column=
"43"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"425"
>
<caret
line=
"82"
column=
"26"
lean-forward=
"true"
selection-start-line=
"82"
selection-start-column=
"26"
selection-end-line=
"82"
selection-end-column=
"26"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/SubscribeController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"350"
>
<caret
line=
"54"
column=
"28"
lean-forward=
"false"
selection-start-line=
"54"
selection-start-column=
"28"
selection-end-line=
"54"
selection-end-column=
"28"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/HomePicController.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/simpleboot3/index/index.html"
/>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/AttrController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
...
...
@@ -661,80 +658,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=
"500"
>
<caret
line=
"99"
column=
"7"
lean-forward=
"true"
selection-start-line=
"99"
selection-start-column=
"7"
selection-end-line=
"99"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#366#715#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#720#1532#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1538#1796#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1801#2184#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2190#2419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2424#4059#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4065#4305#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4310#4545#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4551#4898#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4903#5349#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5355#5615#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5620#5821#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5827#6089#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6094#6299#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6305#6784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6789#8908#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8931#9462#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9468#9748#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9753#10145#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10151#10435#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10440#11479#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11485#11773#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11778#12813#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12819#13400#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13405#14793#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14799#15255#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15260#17223#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17246#17601#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17607#18320#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18325#19782#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19788#20249#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20254#23276#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23282#23891#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23896#25181#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25187#25544#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25549#26430#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26436#26788#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26793#27871#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27877#28232#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28237#29331#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29337#29761#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29766#30377#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30383#30879#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30884#32581#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32587#32871#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32876#33512#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33533#33852#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33858#34266#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34272#35031#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35050#35914#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35940#36340#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36363#36936#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36959#37769#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37775#38374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38379#39343#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39349#40016#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40021#41062#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41068#41731#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41736#42763#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42770#43201#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43206#43784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43790#44219#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44224#44826#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44832#45259#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45264#45830#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Payment/API.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"216"
>
...
...
@@ -843,9 +766,123 @@
</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=
"229"
>
<caret
line=
"33"
column=
"0"
lean-forward=
"true"
selection-start-line=
"33"
selection-start-column=
"0"
selection-end-line=
"33"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#40#78#0#PHP"
expanded=
"true"
/>
<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>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"248"
>
<caret
line=
"38"
column=
"27"
lean-forward=
"false"
selection-start-line=
"38"
selection-start-column=
"27"
selection-end-line=
"38"
selection-end-column=
"27"
/>
<folding>
<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#28313#29407#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29413#29837#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29842#30453#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30459#30955#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30960#32657#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32663#32947#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32952#33588#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33609#33928#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33934#34342#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34348#35107#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35126#35990#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36016#36416#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36439#37012#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37035#37845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37851#38450#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38455#39419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39425#40092#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40097#41138#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41144#41807#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41812#42839#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42846#43277#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43282#43860#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43866#44295#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44300#44902#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44908#45335#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45340#45906#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OrderController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"479"
>
<caret
line=
"125"
column=
"29"
lean-forward=
"false"
selection-start-line=
"125"
selection-start-column=
"29"
selection-end-line=
"125"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#131#162#0#PHP"
expanded=
"true"
/>
<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#2268#3059#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3065#3374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3379#5269#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5277#5756#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5761#6328#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6334#6587#0#PHP"
expanded=
"false"
/>
</folding>
</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=
"
13
6"
>
<state
relative-caret-position=
"
-9
6"
>
<caret
line=
"197"
column=
"28"
lean-forward=
"false"
selection-start-line=
"197"
selection-start-column=
"28"
selection-end-line=
"197"
selection-end-column=
"28"
/>
<folding>
<element
signature=
"e#342#596#0#PHP"
expanded=
"false"
/>
...
...
@@ -885,41 +922,36 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OrderController.php"
>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/FeeController.php"
>
<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>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"13"
column=
"48"
lean-forward=
"true"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"68"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/bounty/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"250"
>
<caret
line=
"152"
column=
"51"
lean-forward=
"true"
selection-start-line=
"152"
selection-start-column=
"51"
selection-end-line=
"152"
selection-end-column=
"51"
/>
<folding>
<element
signature=
"e#131#162#0#PHP"
expanded=
"true"
/>
<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#2268#3059#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3065#3374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5277#5756#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5761#6328#0#PHP"
expanded=
"false"
/>
</folding>
<caret
line=
"10"
column=
"9"
lean-forward=
"true"
selection-start-line=
"10"
selection-start-column=
"9"
selection-end-line=
"10"
selection-end-column=
"9"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/ap
i/index/controller/Pa
yController.php"
>
<entry
file=
"file://$PROJECT_DIR$/ap
p/admin/controller/Bount
yController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"654"
>
<caret
line=
"157"
column=
"33"
lean-forward=
"false"
selection-start-line=
"157"
selection-start-column=
"33"
selection-end-line=
"157"
selection-end-column=
"33"
/>
<state
relative-caret-position=
"111"
>
<caret
line=
"22"
column=
"43"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"43"
selection-end-line=
"22"
selection-end-column=
"43"
/>
<folding>
<element
signature=
"e#40#78#0#PHP"
expanded=
"true"
/>
<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"
/>
<element
signature=
"e#130#169#0#PHP"
expanded=
"true"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/UserController.php
查看文件 @
741aba5
...
...
@@ -33,6 +33,7 @@ class UserController extends RestBaseController
*
* @param name:phone type:int require:1 default: other: desc:手机号
* @param name:code type:string require:1 default: other: desc:验证码
* @param name:inviter_id type:int require:0 default: other: desc:邀请人ID
*
*/
public
function
login
()
...
...
app/admin/controller/FeeController.php
查看文件 @
741aba5
...
...
@@ -24,7 +24,7 @@ class FeeController extends AdminBaseController
'fee'
=>
'require'
,
]);
$validate
->
message
([
'
images
'
=>
'服务费不能为空'
,
'
fee
'
=>
'服务费不能为空'
,
]);
if
(
!
$validate
->
check
(
$param
))
{
$this
->
error
(
$validate
->
getError
());
...
...
data/lang/zh-cn/admin_menu.php
查看文件 @
741aba5
...
...
@@ -2,6 +2,7 @@
return
array
(
'ADMIN_ABOUT_INDEX'
=>
'公司介绍'
,
'ADMIN_ATTR_INDEX'
=>
'回收商品属性列表'
,
'ADMIN_BOUNTY_INDEX'
=>
'奖励金配置'
,
'ADMIN_BUILD_INDEX'
=>
'建筑材料logo图'
,
'ADMIN_FEE_INDEX'
=>
'服务费配置'
,
'ADMIN_HOME_INDEX'
=>
'家政公司列表'
,
...
...
请
注册
或
登录
后发表评论