切换导航条
此项目
正在载入...
登录
郭盛
/
scrap
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
bfd39f22c82732c6bb8183f7408b5dfd8cfc5c89
1 个父辈
1d21f441
1 个管道 的构建
通过
耗费 1 秒
修改后台
变更
4
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
261 行增加
和
338 行删除
.idea/workspace.xml
api/config.php
api/index/controller/OrderController.php
app/admin/controller/ShoporderController.php
.idea/workspace.xml
查看文件 @
bfd39f2
...
...
@@ -2,10 +2,9 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"0011664b-87e9-41bd-9f37-18792fb15777"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/
index/controller/HomeController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/HomeController
.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/
config.php"
afterPath=
"$PROJECT_DIR$/api/config
.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/OrderController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/OrderController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/RecycleController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/RecycleController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/app/admin/controller/ShoporderController.php"
afterPath=
"$PROJECT_DIR$/app/admin/controller/ShoporderController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -101,138 +100,32 @@
</provider>
</entry>
</file>
<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=
"config.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/app/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"753"
>
<caret
line=
"166"
column=
"0"
lean-forward=
"false"
selection-start-line=
"166"
selection-start-column=
"0"
selection-end-line=
"166"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#330#602#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#608#970#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#975#1835#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1841#2078#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2083#2781#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2787#3029#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3035#3272#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3277#3349#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3355#3834#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3839#4406#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"RecycleController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/RecycleController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"102"
>
<caret
line=
"244"
column=
"29"
lean-forward=
"false"
selection-start-line=
"244"
selection-start-column=
"29"
selection-end-line=
"244"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#342#596#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#601#886#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#892#1227#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1232#1729#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1735#1995#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2000#2289#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2295#2634#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2639#3142#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3148#3364#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3369#3738#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3744#4046#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4051#4450#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4456#4653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4658#4915#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4921#5117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5122#5384#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5390#5845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5850#6514#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6520#6863#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6868#7349#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7355#7646#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7651#8002#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8008#8361#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8366#8771#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8777#9160#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9165#9832#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9838#10282#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10287#11134#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11140#11408#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11413#11885#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11891#12197#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12202#13845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13866#14185#0#PHP"
expanded=
"false"
/>
</folding>
<state
relative-caret-position=
"1351"
>
<caret
line=
"235"
column=
"11"
lean-forward=
"true"
selection-start-line=
"235"
selection-start-column=
"11"
selection-end-line=
"235"
selection-end-column=
"11"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ShopgoodsController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.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=
"128"
>
<caret
line=
"188"
column=
"29"
lean-forward=
"false"
selection-start-line=
"188"
selection-start-column=
"29"
selection-end-line=
"188"
selection-end-column=
"29"
/>
<state
relative-caret-position=
"400"
>
<caret
line=
"25"
column=
"46"
lean-forward=
"true"
selection-start-line=
"25"
selection-start-column=
"46"
selection-end-line=
"25"
selection-end-column=
"46"
/>
<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#2102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2108#2326#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2331#2539#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2545#3052#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3057#3575#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3581#4093#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4098#4661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4667#5257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5262#6248#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6254#6572#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6577#6953#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6959#7314#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7319#7728#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7734#8119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8124#8795#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8801#9247#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9252#10103#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10109#10379#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10384#10860#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10866#11496#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11501#13433#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"HomeController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/HomeController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"300"
>
<caret
line=
"150"
column=
"29"
lean-forward=
"false"
selection-start-line=
"150"
selection-start-column=
"29"
selection-end-line=
"150"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#329#544#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#549#890#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#896#1112#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1117#1500#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1506#1726#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1731#2119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2125#2642#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2647#3162#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3168#3696#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3701#4637#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4643#4956#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4961#5336#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5342#5694#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5699#6107#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6113#6495#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6500#7170#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7176#7619#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7624#8474#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8480#8747#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8752#9227#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9233#9783#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9788#11648#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10208#10435#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#10465#10696#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#11654#12021#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12026#12466#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#861#925#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#930#1766#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1772#1853#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1858#3848#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3855#3878#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3883#4142#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4149#4198#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4203#4631#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4637#4701#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4706#5580#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -281,7 +174,6 @@
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/HomeController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/model/HomeModel.php"
/>
<option
value=
"$PROJECT_DIR$/api/config.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"
/>
...
...
@@ -303,12 +195,13 @@
<option
value=
"$PROJECT_DIR$/api/index/controller/PayController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/SubhomeController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/ShoporderController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/UserController.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/ShopgoodsController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/HomeController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OrderController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/ShoporderController.php"
/>
<option
value=
"$PROJECT_DIR$/api/config.php"
/>
</list>
</option>
</component>
...
...
@@ -326,11 +219,11 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"294"
/>
<option
name=
"y"
value=
"56"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"155"
/>
<option
name=
"y"
value=
"77"
/>
<option
name=
"width"
value=
"1700"
/>
<option
name=
"height"
value=
"10
40
"
/>
<option
name=
"height"
value=
"10
38
"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -362,22 +255,25 @@
<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=
"public"
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"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"wechat"
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=
"model"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"wechat"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"cert"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"scrap"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"scrap"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"simplewind"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
...
...
@@ -393,15 +289,15 @@
<property
name=
"DefaultHtmlFileTemplate"
value=
"HTML File"
/>
</component>
<component
name=
"RecentsManager"
>
<key
name=
"MoveFile.RECENT_KEYS"
>
<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\static\js"
/>
</key>
</component>
<component
name=
"RunDashboard"
>
<option
name=
"ruleStates"
>
...
...
@@ -485,18 +381,17 @@
<workItem
from=
"1575444399653"
duration=
"12810000"
/>
<workItem
from=
"1575462840839"
duration=
"250000"
/>
<workItem
from=
"1575506248144"
duration=
"15103000"
/>
<workItem
from=
"1575527294268"
duration=
"
1927
000"
/>
<workItem
from=
"1575527294268"
duration=
"
3424
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"48
3739
000"
/>
<option
name=
"totallyTimeSpent"
value=
"48
5236
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"294"
y=
"56"
width=
"1700"
height=
"1040"
extended-state=
"0"
/>
<editor
active=
"true"
/>
<frame
x=
"155"
y=
"77"
width=
"1700"
height=
"1038"
extended-state=
"1"
/>
<layout>
<window_info
id=
"Project"
active=
"
fals
e"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.16341463"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"
tru
e"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.16341463"
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"
/>
...
...
@@ -547,34 +442,6 @@
<watches-manager
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"543"
>
<caret
line=
"253"
column=
"0"
lean-forward=
"true"
selection-start-line=
"253"
selection-start-column=
"0"
selection-end-line=
"253"
selection-end-column=
"0"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/simplewind/extend/nsms/nsms.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"273"
>
<caret
line=
"14"
column=
"13"
lean-forward=
"false"
selection-start-line=
"14"
selection-start-column=
"13"
selection-end-line=
"14"
selection-end-column=
"13"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/simplewind/cmf/common.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"423"
>
<caret
line=
"1781"
column=
"23"
lean-forward=
"false"
selection-start-line=
"1781"
selection-start-column=
"23"
selection-end-line=
"1781"
selection-end-column=
"23"
/>
</state>
</provider>
</entry>
<entry
file=
"jar://$APPLICATION_HOME_DIR$/lib/phpstorm.jar!/resources/html5-schema/html5/tables.rnc"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"273"
>
<caret
line=
"123"
column=
"16"
lean-forward=
"false"
selection-start-line=
"123"
selection-start-column=
"16"
selection-end-line=
"123"
selection-end-column=
"16"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/IndexController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
...
...
@@ -786,6 +653,12 @@
<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>
...
...
@@ -813,30 +686,11 @@
</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=
"314"
>
<caret
line=
"61"
column=
"0"
lean-forward=
"true"
selection-start-line=
"61"
selection-start-column=
"0"
selection-end-line=
"61"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#324#855#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#861#925#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#930#1766#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1772#1853#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1858#3848#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3855#3878#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3883#4142#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4149#4198#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4203#4631#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4637#4701#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4706#5580#0#PHP"
expanded=
"false"
/>
</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=
"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>
...
...
@@ -854,17 +708,178 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/S
hoporder
Controller.php"
>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/S
ubhome
Controller.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"52"
column=
"26"
lean-forward=
"false"
selection-start-line=
"52"
selection-start-column=
"26"
selection-end-line=
"52"
selection-end-column=
"26"
/>
<folding>
<element
signature=
"e#243#1652#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1669#3046#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/ap
p/admin/controller/SubhomeController
.php"
>
<entry
file=
"file://$PROJECT_DIR$/ap
i/index/model/OrderModel
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"52"
column=
"26"
lean-forward=
"false"
selection-start-line=
"52"
selection-start-column=
"26"
selection-end-line=
"52"
selection-end-column=
"26"
/>
<caret
line=
"18"
column=
"20"
lean-forward=
"false"
selection-start-line=
"18"
selection-start-column=
"20"
selection-end-line=
"18"
selection-end-column=
"20"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"158"
>
<caret
line=
"16"
column=
"77"
lean-forward=
"true"
selection-start-line=
"16"
selection-start-column=
"15"
selection-end-line=
"16"
selection-end-column=
"77"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/HomeController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"300"
>
<caret
line=
"150"
column=
"29"
lean-forward=
"false"
selection-start-line=
"150"
selection-start-column=
"29"
selection-end-line=
"150"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#329#544#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#549#890#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#896#1112#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1117#1500#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1506#1726#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1731#2119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2125#2642#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2647#3162#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3168#3696#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3701#4637#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4643#4956#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4961#5336#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5342#5694#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5699#6107#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6113#6495#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6500#7170#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7176#7619#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7624#8474#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8480#8747#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8752#9227#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9233#9783#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9788#11648#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10208#10435#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#10465#10696#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#11654#12021#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12026#12466#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"128"
>
<caret
line=
"188"
column=
"29"
lean-forward=
"false"
selection-start-line=
"188"
selection-start-column=
"29"
selection-end-line=
"188"
selection-end-column=
"29"
/>
<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#2102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2108#2326#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2331#2539#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2545#3052#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3057#3575#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3581#4093#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4098#4661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4667#5257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5262#6248#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6254#6572#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6577#6953#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6959#7314#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7319#7728#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7734#8119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8124#8795#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8801#9247#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9252#10103#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10109#10379#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10384#10860#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10866#11496#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11501#13433#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=
"102"
>
<caret
line=
"244"
column=
"29"
lean-forward=
"false"
selection-start-line=
"244"
selection-start-column=
"29"
selection-end-line=
"244"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#342#596#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#601#886#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#892#1227#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1232#1729#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1735#1995#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2000#2289#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2295#2634#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2639#3142#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3148#3364#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3369#3738#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3744#4046#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4051#4450#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4456#4653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4658#4915#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4921#5117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5122#5384#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5390#5845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5850#6514#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6520#6863#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6868#7349#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7355#7646#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7651#8002#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8008#8361#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8366#8771#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8777#9160#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9165#9832#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9838#10282#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10287#11134#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11140#11408#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11413#11885#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11891#12197#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12202#13845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13866#14185#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"725"
>
<caret
line=
"114"
column=
"12"
lean-forward=
"false"
selection-start-line=
"114"
selection-start-column=
"12"
selection-end-line=
"114"
selection-end-column=
"12"
/>
<folding>
<element
signature=
"e#265#1638#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1655#3619#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=
"676"
>
<caret
line=
"161"
column=
"5"
lean-forward=
"false"
selection-start-line=
"161"
selection-start-column=
"5"
selection-end-line=
"161"
selection-end-column=
"5"
/>
<folding>
<element
signature=
"e#330#602#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#608#970#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#975#1835#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1841#2078#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2083#2781#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2787#3029#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3035#3272#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3277#3349#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3355#3834#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3839#4406#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"551"
>
<caret
line=
"259"
column=
"35"
lean-forward=
"true"
selection-start-line=
"259"
selection-start-column=
"35"
selection-end-line=
"259"
selection-end-column=
"35"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -940,147 +955,45 @@
</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=
"753"
>
<caret
line=
"166"
column=
"0"
lean-forward=
"false"
selection-start-line=
"166"
selection-start-column=
"0"
selection-end-line=
"166"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#330#602#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#608#970#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#975#1835#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1841#2078#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2083#2781#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2787#3029#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3035#3272#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3277#3349#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3355#3834#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3839#4406#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/model/OrderModel.php"
>
<entry
file=
"file://$PROJECT_DIR$/app/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"18"
column=
"20"
lean-forward=
"false"
selection-start-line=
"18"
selection-start-column=
"20"
selection-end-line=
"18"
selection-end-column=
"20"
/>
<state
relative-caret-position=
"1351"
>
<caret
line=
"235"
column=
"11"
lean-forward=
"true"
selection-start-line=
"235"
selection-start-column=
"11"
selection-end-line=
"235"
selection-end-column=
"11"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
api/index/model/ShopgoodsModel.php
"
>
<entry
file=
"file://$PROJECT_DIR$/
public/wechat/cert/证书使用说明.txt
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"158"
>
<caret
line=
"16"
column=
"77"
lean-forward=
"true"
selection-start-line=
"16"
selection-start-column=
"15"
selection-end-line=
"16"
selection-end-column=
"77"
/>
<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$/
api/index/controller/RecycleController.php
"
>
<entry
file=
"file://$PROJECT_DIR$/
public/wechat/cert/apiclient_key.pem
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"102"
>
<caret
line=
"244"
column=
"29"
lean-forward=
"false"
selection-start-line=
"244"
selection-start-column=
"29"
selection-end-line=
"244"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#342#596#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#601#886#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#892#1227#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1232#1729#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1735#1995#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2000#2289#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2295#2634#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2639#3142#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3148#3364#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3369#3738#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3744#4046#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4051#4450#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4456#4653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4658#4915#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4921#5117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5122#5384#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5390#5845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5850#6514#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6520#6863#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6868#7349#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7355#7646#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7651#8002#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8008#8361#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8366#8771#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8777#9160#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9165#9832#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9838#10282#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10287#11134#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11140#11408#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11413#11885#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11891#12197#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12202#13845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13866#14185#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"128"
>
<caret
line=
"188"
column=
"29"
lean-forward=
"false"
selection-start-line=
"188"
selection-start-column=
"29"
selection-end-line=
"188"
selection-end-column=
"29"
/>
<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#2102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2108#2326#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2331#2539#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2545#3052#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3057#3575#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3581#4093#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4098#4661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4667#5257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5262#6248#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6254#6572#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6577#6953#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6959#7314#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7319#7728#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7734#8119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8124#8795#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8801#9247#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9252#10103#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10109#10379#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10384#10860#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10866#11496#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11501#13433#0#PHP"
expanded=
"false"
/>
</folding>
<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$/api/index/controller/
Home
Controller.php"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/
Pay
Controller.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"300"
>
<caret
line=
"150"
column=
"29"
lean-forward=
"false"
selection-start-line=
"150"
selection-start-column=
"29"
selection-end-line=
"150"
selection-end-column=
"29"
/>
<state
relative-caret-position=
"400"
>
<caret
line=
"25"
column=
"46"
lean-forward=
"true"
selection-start-line=
"25"
selection-start-column=
"46"
selection-end-line=
"25"
selection-end-column=
"46"
/>
<folding>
<element
signature=
"e#329#544#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#549#890#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#896#1112#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1117#1500#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1506#1726#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1731#2119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2125#2642#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2647#3162#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3168#3696#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3701#4637#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4643#4956#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4961#5336#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5342#5694#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5699#6107#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6113#6495#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6500#7170#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7176#7619#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7624#8474#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8480#8747#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8752#9227#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9233#9783#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9788#11648#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10208#10435#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#10465#10696#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#11654#12021#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12026#12466#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#861#925#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#930#1766#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1772#1853#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1858#3848#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3855#3878#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3883#4142#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4149#4198#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4203#4631#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4637#4701#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4706#5580#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/config.php
查看文件 @
bfd39f2
...
...
@@ -257,8 +257,8 @@ return [
'cmf_admin_default_theme'
=>
'simpleboot3'
,
//小程序配置
'app_id'
=>
'wxd4445f65df16adca'
,
'app_secret'
=>
'7d3ae6aa7dc7f11571830f4afaec4c5f'
,
'app_id'
=>
'wxd7010deb3b696146'
,
'app_secret'
=>
'282f4cc8536523076c9d16af6331ffb6'
,
'wx_mch_id'
=>
'1563087351'
,
'wx_pay_key'
=>
'P1GSxsjA4Ts3g6V95FVE49bNQLClGckS'
,
...
...
api/index/controller/OrderController.php
查看文件 @
bfd39f2
...
...
@@ -160,12 +160,4 @@ class OrderController extends RestBaseController
}
$this
->
success
(
'SUCCESS'
,
$list
);
}
//自动修改订单状态
public
function
update
()
{
}
}
\ No newline at end of file
...
...
app/admin/controller/ShoporderController.php
查看文件 @
bfd39f2
...
...
@@ -70,7 +70,7 @@ class ShoporderController extends AdminBaseController
->
update
(
$param
);
Db
::
name
(
'shoporder'
)
->
where
(
'id'
,
$id
)
->
update
([
'orderstatus'
=>
2
,
'fa_time'
=>
time
()]);
->
update
([
'orderstatus'
=>
2
,
'fa_time'
=>
time
()
,
'guo_time'
=>
time
()
+
15
*
86400
]);
$this
->
success
(
'更新成功!'
);
}
else
{
Db
::
name
(
'shoporder'
)
...
...
@@ -98,4 +98,22 @@ class ShoporderController extends AdminBaseController
}
}
//自动修改订单状态
public
function
update
()
{
$data
=
Db
::
name
(
'shoporder'
)
->
where
(
'orderstatus'
,
2
)
->
select
()
->
toArray
();
foreach
(
$data
as
&
$v
){
if
(
$v
[
'guo_time'
]
<
time
()){
Db
::
name
(
'shoporder'
)
->
where
(
'id'
,
$v
[
'id'
])
->
update
([
'orderstatus'
=>
3
]);
}
else
{
true
;
}
}
}
}
\ No newline at end of file
...
...
请
注册
或
登录
后发表评论