郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 53270c1ede8dcdf8d8a1b70861339e712a04cb6d 1 个父辈 30f8ad13
1 个管道 的构建 通过 耗费 2 秒

添加后台个人信息购买详情

内嵌 并排对比
正在显示 9 个修改的文件 包含 567 行增加 和 310 行删除
@@ -5,9 +5,15 @@ @@ -5,9 +5,15 @@
5 </component> 5 </component>
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 7 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
  8 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/controller/OrderDetail.php" />
  9 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/view/order_detail/index.html" />
  10 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/assets/js/backend/order_detail.js" />
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> 12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/user/User.php" afterPath="$PROJECT_DIR$/application/admin/controller/user/User.php" />
  13 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/model/User.php" afterPath="$PROJECT_DIR$/application/admin/model/User.php" />
  14 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/user/user/index.html" afterPath="$PROJECT_DIR$/application/admin/view/user/user/index.html" />
10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" /> 15 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
  16 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/user/user.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/user/user.js" />
11 </list> 17 </list>
12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 18 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
13 <option name="TRACKING_ENABLED" value="true" /> 19 <option name="TRACKING_ENABLED" value="true" />
@@ -18,109 +24,22 @@ @@ -18,109 +24,22 @@
18 </component> 24 </component>
19 <component name="FileEditorManager"> 25 <component name="FileEditorManager">
20 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
21 - <file leaf-file-name="User.php" pinned="false" current-in-tab="true">  
22 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 27 + <file leaf-file-name="order_detail.js" pinned="false" current-in-tab="false">
  28 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order_detail.js">
23 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
24 - <state relative-caret-position="718">  
25 - <caret line="2422" column="1" lean-forward="true" selection-start-line="2422" selection-start-column="1" selection-end-line="2422" selection-end-column="1" />  
26 - <folding>  
27 - <element signature="e#4287#4721#0#PHP" expanded="false" />  
28 - <element signature="e#4726#5084#0#PHP" expanded="false" />  
29 - <element signature="e#5090#5497#0#PHP" expanded="false" />  
30 - <element signature="e#5502#5845#0#PHP" expanded="false" />  
31 - <element signature="e#5851#6264#0#PHP" expanded="false" />  
32 - <element signature="e#6269#6586#0#PHP" expanded="false" />  
33 - <element signature="e#6592#7691#0#PHP" expanded="false" />  
34 - <element signature="e#7696#13097#0#PHP" expanded="false" />  
35 - <element signature="e#13103#13783#0#PHP" expanded="false" />  
36 - <element signature="e#13788#14646#0#PHP" expanded="false" />  
37 - <element signature="e#14652#15441#0#PHP" expanded="false" />  
38 - <element signature="e#15446#16795#0#PHP" expanded="false" />  
39 - <element signature="e#16801#17503#0#PHP" expanded="false" />  
40 - <element signature="e#17508#18828#0#PHP" expanded="false" />  
41 - <element signature="e#18834#19410#0#PHP" expanded="false" />  
42 - <element signature="e#19415#20027#0#PHP" expanded="false" />  
43 - <element signature="e#20033#20749#0#PHP" expanded="false" />  
44 - <element signature="e#20754#25622#0#PHP" expanded="false" />  
45 - <element signature="e#25631#26561#0#PHP" expanded="false" />  
46 - <element signature="e#26566#31707#0#PHP" expanded="false" />  
47 - <element signature="e#31713#32090#0#PHP" expanded="false" />  
48 - <element signature="e#32095#32534#0#PHP" expanded="false" />  
49 - <element signature="e#32540#33361#0#PHP" expanded="false" />  
50 - <element signature="e#33366#36770#0#PHP" expanded="false" />  
51 - <element signature="e#36776#37281#0#PHP" expanded="false" />  
52 - <element signature="e#37286#37537#0#PHP" expanded="false" />  
53 - <element signature="e#37543#38022#0#PHP" expanded="false" />  
54 - <element signature="e#38027#38784#0#PHP" expanded="false" />  
55 - <element signature="e#38790#39271#0#PHP" expanded="false" />  
56 - <element signature="e#39276#40146#0#PHP" expanded="false" />  
57 - <element signature="e#40152#40515#0#PHP" expanded="false" />  
58 - <element signature="e#40520#40711#0#PHP" expanded="false" />  
59 - <element signature="e#40717#41075#0#PHP" expanded="false" />  
60 - <element signature="e#41080#41271#0#PHP" expanded="false" />  
61 - <element signature="e#41277#42420#0#PHP" expanded="false" />  
62 - <element signature="e#42425#45090#0#PHP" expanded="false" />  
63 - <element signature="e#45096#45594#0#PHP" expanded="false" />  
64 - <element signature="e#45599#47345#0#PHP" expanded="false" />  
65 - <element signature="e#47351#47764#0#PHP" expanded="false" />  
66 - <element signature="e#47769#48248#0#PHP" expanded="false" />  
67 - <element signature="e#48254#48788#0#PHP" expanded="false" />  
68 - <element signature="e#48793#50178#0#PHP" expanded="false" />  
69 - <element signature="e#50184#50838#0#PHP" expanded="false" />  
70 - <element signature="e#50843#52858#0#PHP" expanded="false" />  
71 - <element signature="e#52864#53624#0#PHP" expanded="false" />  
72 - <element signature="e#53629#56338#0#PHP" expanded="false" />  
73 - <element signature="e#56364#57195#0#PHP" expanded="false" />  
74 - <element signature="e#57201#57621#0#PHP" expanded="false" />  
75 - <element signature="e#57626#58109#0#PHP" expanded="false" />  
76 - <element signature="e#58115#58921#0#PHP" expanded="false" />  
77 - <element signature="e#58926#62084#0#PHP" expanded="false" />  
78 - <element signature="e#62099#63434#0#PHP" expanded="false" />  
79 - <element signature="e#63450#64484#0#PHP" expanded="false" />  
80 - <element signature="e#64490#65248#0#PHP" expanded="false" />  
81 - <element signature="e#65253#68996#0#PHP" expanded="false" />  
82 - <element signature="e#69002#69394#0#PHP" expanded="false" />  
83 - <element signature="e#69399#70351#0#PHP" expanded="false" />  
84 - <element signature="e#70375#70948#0#PHP" expanded="false" />  
85 - <element signature="e#70954#71553#0#PHP" expanded="false" />  
86 - <element signature="e#71558#72485#0#PHP" expanded="false" />  
87 - <element signature="e#72491#73205#0#PHP" expanded="false" />  
88 - <element signature="e#73211#73638#0#PHP" expanded="false" />  
89 - <element signature="e#73643#74112#0#PHP" expanded="false" />  
90 - <element signature="e#74119#75324#0#PHP" expanded="false" />  
91 - <element signature="e#75329#77032#0#PHP" expanded="false" />  
92 - <element signature="e#77038#77815#0#PHP" expanded="false" />  
93 - <element signature="e#77820#81758#0#PHP" expanded="false" />  
94 - <element signature="e#81764#82273#0#PHP" expanded="false" />  
95 - <element signature="e#82278#82950#0#PHP" expanded="false" />  
96 - </folding> 30 + <state relative-caret-position="475">
  31 + <caret line="28" column="78" lean-forward="true" selection-start-line="28" selection-start-column="78" selection-end-line="28" selection-end-column="78" />
  32 + <folding />
97 </state> 33 </state>
98 </provider> 34 </provider>
99 </entry> 35 </entry>
100 </file> 36 </file>
101 - <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">  
102 - <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 37 + <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
  38 + <entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html">
103 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
104 - <state relative-caret-position="218">  
105 - <caret line="335" column="5" lean-forward="true" selection-start-line="335" selection-start-column="5" selection-end-line="335" selection-end-column="5" />  
106 - <folding>  
107 - <element signature="e#706#1019#0#PHP" expanded="false" />  
108 - <element signature="e#1024#3100#0#PHP" expanded="false" />  
109 - <element signature="e#3106#3426#0#PHP" expanded="false" />  
110 - <element signature="e#3431#5630#0#PHP" expanded="false" />  
111 - <element signature="e#5636#6050#0#PHP" expanded="false" />  
112 - <element signature="e#6055#16076#0#PHP" expanded="false" />  
113 - <element signature="e#7031#16009#0#PHP" expanded="false" />  
114 - <element signature="e#16083#16400#0#PHP" expanded="false" />  
115 - <element signature="e#16405#16883#0#PHP" expanded="false" />  
116 - <element signature="e#16900#17197#0#PHP" expanded="false" />  
117 - <element signature="e#17202#17595#0#PHP" expanded="false" />  
118 - <element signature="e#17622#20883#0#PHP" expanded="false" />  
119 - <element signature="e#20912#23550#0#PHP" expanded="false" />  
120 - <element signature="e#23583#29910#0#PHP" expanded="false" />  
121 - <element signature="e#24378#29668#0#PHP" expanded="false" />  
122 - <element signature="e#29933#30150#0#PHP" expanded="false" />  
123 - </folding> 40 + <state relative-caret-position="100">
  41 + <caret line="4" column="51" lean-forward="true" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />
  42 + <folding />
124 </state> 43 </state>
125 </provider> 44 </provider>
126 </entry> 45 </entry>
@@ -154,6 +73,7 @@ @@ -154,6 +73,7 @@
154 <find>vippayOrderNotify</find> 73 <find>vippayOrderNotify</find>
155 <find>充值</find> 74 <find>充值</find>
156 <find>$data['money']</find> 75 <find>$data['money']</find>
  76 + <find>statusList</find>
157 </findStrings> 77 </findStrings>
158 <replaceStrings> 78 <replaceStrings>
159 <replace /> 79 <replace />
@@ -168,16 +88,6 @@ @@ -168,16 +88,6 @@
168 <component name="IdeDocumentHistory"> 88 <component name="IdeDocumentHistory">
169 <option name="CHANGED_PATHS"> 89 <option name="CHANGED_PATHS">
170 <list> 90 <list>
171 - <option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />  
172 - <option value="$PROJECT_DIR$/public/assets/js/backend/feng.js" />  
173 - <option value="$PROJECT_DIR$/application/admin/view/feng/add.html" />  
174 - <option value="$PROJECT_DIR$/application/admin/view/feng/index.html" />  
175 - <option value="$PROJECT_DIR$/application/admin/view/feng/edit.html" />  
176 - <option value="$PROJECT_DIR$/application/api/controller/Common.php" />  
177 - <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />  
178 - <option value="$PROJECT_DIR$/application/admin/view/cover/add.html" />  
179 - <option value="$PROJECT_DIR$/application/admin/view/cover/index.html" />  
180 - <option value="$PROJECT_DIR$/application/admin/view/cover/edit.html" />  
181 <option value="$PROJECT_DIR$/public/assets/js/backend/cover.js" /> 91 <option value="$PROJECT_DIR$/public/assets/js/backend/cover.js" />
182 <option value="$PROJECT_DIR$/application/admin/view/words/index.html" /> 92 <option value="$PROJECT_DIR$/application/admin/view/words/index.html" />
183 <option value="$PROJECT_DIR$/application/admin/model/Video.php" /> 93 <option value="$PROJECT_DIR$/application/admin/model/Video.php" />
@@ -219,6 +129,16 @@ @@ -219,6 +129,16 @@
219 <option value="$PROJECT_DIR$/application/config.php" /> 129 <option value="$PROJECT_DIR$/application/config.php" />
220 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> 130 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
221 <option value="$PROJECT_DIR$/application/api/controller/User.php" /> 131 <option value="$PROJECT_DIR$/application/api/controller/User.php" />
  132 + <option value="$PROJECT_DIR$/application/admin/model/User.php" />
  133 + <option value="$PROJECT_DIR$/application/admin/controller/user/User.php" />
  134 + <option value="$PROJECT_DIR$/application/admin/view/user/user/index.html" />
  135 + <option value="$PROJECT_DIR$/application/admin/view/order1/index.html" />
  136 + <option value="$PROJECT_DIR$/public/assets/js/backend/order1.js" />
  137 + <option value="$PROJECT_DIR$/application/admin/controller/Order1.php" />
  138 + <option value="$PROJECT_DIR$/public/assets/js/backend/user/user.js" />
  139 + <option value="$PROJECT_DIR$/application/admin/controller/OrderDetail.php" />
  140 + <option value="$PROJECT_DIR$/public/assets/js/backend/order_detail.js" />
  141 + <option value="$PROJECT_DIR$/application/admin/view/order_detail/index.html" />
222 </list> 142 </list>
223 </option> 143 </option>
224 </component> 144 </component>
@@ -236,10 +156,11 @@ @@ -236,10 +156,11 @@
236 <sorting>DEFINITION_ORDER</sorting> 156 <sorting>DEFINITION_ORDER</sorting>
237 </component> 157 </component>
238 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 158 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
239 - <component name="ProjectFrameBounds">  
240 - <option name="x" value="676" />  
241 - <option name="width" value="1747" />  
242 - <option name="height" value="1030" /> 159 + <component name="ProjectFrameBounds" extendedState="7">
  160 + <option name="x" value="95" />
  161 + <option name="y" value="39" />
  162 + <option name="width" value="1783" />
  163 + <option name="height" value="953" />
243 </component> 164 </component>
244 <component name="ProjectView"> 165 <component name="ProjectView">
245 <navigator currentView="ProjectPane" proportions="" version="1"> 166 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -256,7 +177,6 @@ @@ -256,7 +177,6 @@
256 <foldersAlwaysOnTop value="true" /> 177 <foldersAlwaysOnTop value="true" />
257 </navigator> 178 </navigator>
258 <panes> 179 <panes>
259 - <pane id="Scope" />  
260 <pane id="ProjectPane"> 180 <pane id="ProjectPane">
261 <subPane> 181 <subPane>
262 <expand> 182 <expand>
@@ -273,29 +193,86 @@ @@ -273,29 +193,86 @@
273 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 193 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
274 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 194 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
275 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 195 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
276 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 196 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
277 </path> 197 </path>
278 <path> 198 <path>
279 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 199 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
280 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 200 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
281 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 201 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
282 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 202 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
283 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 203 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
284 </path> 204 </path>
  205 + <path>
  206 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  207 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  208 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  209 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  210 + <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
  211 + </path>
  212 + <path>
  213 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  214 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  215 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  216 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  217 + <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
  218 + <item name="order_detail" type="2a2b976b:PhpTreeStructureProvider$1" />
  219 + </path>
  220 + <path>
  221 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  222 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  223 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  224 + </path>
  225 + <path>
  226 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  227 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  228 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  229 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  230 + </path>
  231 + <path>
  232 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  233 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  234 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  235 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  236 + <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
  237 + </path>
  238 + <path>
  239 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  240 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  241 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  242 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  243 + <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
  244 + <item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
  245 + </path>
  246 + <path>
  247 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  248 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  249 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  250 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  251 + <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
  252 + <item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
  253 + <item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
  254 + </path>
285 </expand> 255 </expand>
286 <select /> 256 <select />
287 </subPane> 257 </subPane>
288 </pane> 258 </pane>
  259 + <pane id="Scope" />
289 <pane id="Scratches" /> 260 <pane id="Scratches" />
290 </panes> 261 </panes>
291 </component> 262 </component>
292 <component name="PropertiesComponent"> 263 <component name="PropertiesComponent">
293 <property name="WebServerToolWindowFactoryState" value="false" /> 264 <property name="WebServerToolWindowFactoryState" value="false" />
294 - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> 265 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../fastadmin/questions" />
295 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 266 <property name="DefaultHtmlFileTemplate" value="HTML File" />
296 <property name="settings.editor.selected.configurable" value="preferences.keymap" /> 267 <property name="settings.editor.selected.configurable" value="preferences.keymap" />
297 </component> 268 </component>
298 <component name="RecentsManager"> 269 <component name="RecentsManager">
  270 + <key name="MoveFile.RECENT_KEYS">
  271 + <recent name="D:\htdocs\areial\public\uploads\20191120" />
  272 + <recent name="D:\htdocs\areial\public\uploads" />
  273 + <recent name="D:\htdocs\areial\public\cert" />
  274 + <recent name="D:\htdocs\areial\public\uploads\20191118" />
  275 + </key>
299 <key name="CopyFile.RECENT_KEYS"> 276 <key name="CopyFile.RECENT_KEYS">
300 <recent name="D:\htdocs\areial\public\assets\js" /> 277 <recent name="D:\htdocs\areial\public\assets\js" />
301 <recent name="D:\htdocs\areial\public\assets\libs\bootstrap-table\dist\extensions" /> 278 <recent name="D:\htdocs\areial\public\assets\libs\bootstrap-table\dist\extensions" />
@@ -303,12 +280,6 @@ @@ -303,12 +280,6 @@
303 <recent name="D:\htdocs\areial\extend" /> 280 <recent name="D:\htdocs\areial\extend" />
304 <recent name="D:\htdocs\areial\public\uploads\20191118" /> 281 <recent name="D:\htdocs\areial\public\uploads\20191118" />
305 </key> 282 </key>
306 - <key name="MoveFile.RECENT_KEYS">  
307 - <recent name="D:\htdocs\areial\public\uploads\20191120" />  
308 - <recent name="D:\htdocs\areial\public\uploads" />  
309 - <recent name="D:\htdocs\areial\public\cert" />  
310 - <recent name="D:\htdocs\areial\public\uploads\20191118" />  
311 - </key>  
312 </component> 283 </component>
313 <component name="RunDashboard"> 284 <component name="RunDashboard">
314 <option name="ruleStates"> 285 <option name="ruleStates">
@@ -452,7 +423,10 @@ @@ -452,7 +423,10 @@
452 <workItem from="1587016148758" duration="630000" /> 423 <workItem from="1587016148758" duration="630000" />
453 <workItem from="1587698628412" duration="1095000" /> 424 <workItem from="1587698628412" duration="1095000" />
454 <workItem from="1590118157459" duration="15359000" /> 425 <workItem from="1590118157459" duration="15359000" />
455 - <workItem from="1590137451444" duration="774000" /> 426 + <workItem from="1590137451444" duration="1533000" />
  427 + <workItem from="1590141410628" duration="1864000" />
  428 + <workItem from="1590193431145" duration="1982000" />
  429 + <workItem from="1590217205221" duration="7795000" />
456 </task> 430 </task>
457 <task id="LOCAL-00001" summary="调试"> 431 <task id="LOCAL-00001" summary="调试">
458 <created>1574145133364</created> 432 <created>1574145133364</created>
@@ -636,11 +610,46 @@ @@ -636,11 +610,46 @@
636 <option name="project" value="LOCAL" /> 610 <option name="project" value="LOCAL" />
637 <updated>1590134877187</updated> 611 <updated>1590134877187</updated>
638 </task> 612 </task>
639 - <option name="localTasksCounter" value="27" /> 613 + <task id="LOCAL-00027" summary="订单支付回调调试">
  614 + <created>1590141490625</created>
  615 + <option name="number" value="00027" />
  616 + <option name="presentableId" value="LOCAL-00027" />
  617 + <option name="project" value="LOCAL" />
  618 + <updated>1590141490625</updated>
  619 + </task>
  620 + <task id="LOCAL-00028" summary="订单支付回调调试">
  621 + <created>1590142690455</created>
  622 + <option name="number" value="00028" />
  623 + <option name="presentableId" value="LOCAL-00028" />
  624 + <option name="project" value="LOCAL" />
  625 + <updated>1590142690455</updated>
  626 + </task>
  627 + <task id="LOCAL-00029" summary="订单支付回调调试">
  628 + <created>1590193444584</created>
  629 + <option name="number" value="00029" />
  630 + <option name="presentableId" value="LOCAL-00029" />
  631 + <option name="project" value="LOCAL" />
  632 + <updated>1590193444584</updated>
  633 + </task>
  634 + <task id="LOCAL-00030" summary="订单支付回调调试">
  635 + <created>1590221336813</created>
  636 + <option name="number" value="00030" />
  637 + <option name="presentableId" value="LOCAL-00030" />
  638 + <option name="project" value="LOCAL" />
  639 + <updated>1590221336813</updated>
  640 + </task>
  641 + <task id="LOCAL-00031" summary="订单支付回调调试">
  642 + <created>1590222367309</created>
  643 + <option name="number" value="00031" />
  644 + <option name="presentableId" value="LOCAL-00031" />
  645 + <option name="project" value="LOCAL" />
  646 + <updated>1590222367309</updated>
  647 + </task>
  648 + <option name="localTasksCounter" value="32" />
640 <servers /> 649 <servers />
641 </component> 650 </component>
642 <component name="TimeTrackingManager"> 651 <component name="TimeTrackingManager">
643 - <option name="totallyTimeSpent" value="676359000" /> 652 + <option name="totallyTimeSpent" value="688759000" />
644 </component> 653 </component>
645 <component name="TodoView"> 654 <component name="TodoView">
646 <todo-panel id="selected-file"> 655 <todo-panel id="selected-file">
@@ -652,19 +661,19 @@ @@ -652,19 +661,19 @@
652 </todo-panel> 661 </todo-panel>
653 </component> 662 </component>
654 <component name="ToolWindowManager"> 663 <component name="ToolWindowManager">
655 - <frame x="676" y="0" width="1747" height="1030" extended-state="0" /> 664 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
656 <editor active="true" /> 665 <editor active="true" />
657 <layout> 666 <layout>
658 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14285715" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 667 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13326226" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
659 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> 668 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
660 <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.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> 669 <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.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
661 <window_info id="Database" active="false" anchor="right" 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" /> 670 <window_info id="Database" active="false" anchor="right" 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" />
662 - <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="5" side_tool="false" content_ui="tabs" />  
663 <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="1" side_tool="false" content_ui="tabs" /> 671 <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="1" side_tool="false" content_ui="tabs" />
  672 + <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="5" side_tool="false" content_ui="tabs" />
664 <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="2" side_tool="false" content_ui="tabs" /> 673 <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="2" side_tool="false" content_ui="tabs" />
665 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45048967" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />  
666 - <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="6" side_tool="false" content_ui="tabs" /> 674 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.449711" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
667 <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="0" side_tool="true" content_ui="tabs" /> 675 <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="0" side_tool="true" content_ui="tabs" />
  676 + <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="6" side_tool="false" content_ui="tabs" />
668 <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="7" side_tool="false" content_ui="tabs" /> 677 <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="7" side_tool="false" content_ui="tabs" />
669 <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="3" side_tool="false" content_ui="tabs" /> 678 <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="3" side_tool="false" content_ui="tabs" />
670 <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="1" side_tool="false" content_ui="tabs" /> 679 <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="1" side_tool="false" content_ui="tabs" />
@@ -714,48 +723,6 @@ @@ -714,48 +723,6 @@
714 <watches-manager /> 723 <watches-manager />
715 </component> 724 </component>
716 <component name="editorHistoryManager"> 725 <component name="editorHistoryManager">
717 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Category.php">  
718 - <provider selected="true" editor-type-id="text-editor">  
719 - <state relative-caret-position="254">  
720 - <caret line="134" column="0" lean-forward="true" selection-start-line="134" selection-start-column="0" selection-end-line="144" selection-end-column="5" />  
721 - </state>  
722 - </provider>  
723 - </entry>  
724 - <entry file="file://$PROJECT_DIR$/application/admin/view/share/index.html">  
725 - <provider selected="true" editor-type-id="text-editor">  
726 - <state relative-caret-position="325">  
727 - <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />  
728 - </state>  
729 - </provider>  
730 - </entry>  
731 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/share.js">  
732 - <provider selected="true" editor-type-id="text-editor">  
733 - <state relative-caret-position="350">  
734 - <caret line="26" column="53" lean-forward="true" selection-start-line="26" selection-start-column="53" selection-end-line="26" selection-end-column="53" />  
735 - </state>  
736 - </provider>  
737 - </entry>  
738 - <entry file="file://$PROJECT_DIR$/application/admin/view/share/edit.html">  
739 - <provider selected="true" editor-type-id="text-editor">  
740 - <state relative-caret-position="350">  
741 - <caret line="14" column="14" lean-forward="true" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />  
742 - </state>  
743 - </provider>  
744 - </entry>  
745 - <entry file="file://$PROJECT_DIR$/application/admin/view/share/add.html">  
746 - <provider selected="true" editor-type-id="text-editor">  
747 - <state relative-caret-position="550">  
748 - <caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="22" selection-end-column="10" />  
749 - </state>  
750 - </provider>  
751 - </entry>  
752 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Share.php">  
753 - <provider selected="true" editor-type-id="text-editor">  
754 - <state relative-caret-position="0">  
755 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
756 - </state>  
757 - </provider>  
758 - </entry>  
759 <entry file="file://$PROJECT_DIR$/application/common/library/token/Driver.php"> 726 <entry file="file://$PROJECT_DIR$/application/common/library/token/Driver.php">
760 <provider selected="true" editor-type-id="text-editor"> 727 <provider selected="true" editor-type-id="text-editor">
761 <state relative-caret-position="269"> 728 <state relative-caret-position="269">
@@ -834,13 +801,6 @@ @@ -834,13 +801,6 @@
834 </state> 801 </state>
835 </provider> 802 </provider>
836 </entry> 803 </entry>
837 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">  
838 - <provider selected="true" editor-type-id="text-editor">  
839 - <state relative-caret-position="0">  
840 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
841 - </state>  
842 - </provider>  
843 - </entry>  
844 <entry file="file://$PROJECT_DIR$/application/admin/view/video/index.html"> 804 <entry file="file://$PROJECT_DIR$/application/admin/view/video/index.html">
845 <provider selected="true" editor-type-id="text-editor"> 805 <provider selected="true" editor-type-id="text-editor">
846 <state relative-caret-position="0"> 806 <state relative-caret-position="0">
@@ -900,13 +860,6 @@ @@ -900,13 +860,6 @@
900 <state /> 860 <state />
901 </provider> 861 </provider>
902 </entry> 862 </entry>
903 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">  
904 - <provider selected="true" editor-type-id="text-editor">  
905 - <state relative-caret-position="150">  
906 - <caret line="27" column="69" lean-forward="true" selection-start-line="27" selection-start-column="69" selection-end-line="27" selection-end-column="69" />  
907 - </state>  
908 - </provider>  
909 - </entry>  
910 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js"> 863 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
911 <provider selected="true" editor-type-id="text-editor"> 864 <provider selected="true" editor-type-id="text-editor">
912 <state relative-caret-position="775"> 865 <state relative-caret-position="775">
@@ -957,13 +910,6 @@ @@ -957,13 +910,6 @@
957 </state> 910 </state>
958 </provider> 911 </provider>
959 </entry> 912 </entry>
960 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">  
961 - <provider selected="true" editor-type-id="text-editor">  
962 - <state relative-caret-position="-24">  
963 - <caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />  
964 - </state>  
965 - </provider>  
966 - </entry>  
967 <entry file="file://$PROJECT_DIR$/application/admin/library/Auth.php"> 913 <entry file="file://$PROJECT_DIR$/application/admin/library/Auth.php">
968 <provider selected="true" editor-type-id="text-editor"> 914 <provider selected="true" editor-type-id="text-editor">
969 <state relative-caret-position="442"> 915 <state relative-caret-position="442">
@@ -986,13 +932,6 @@ @@ -986,13 +932,6 @@
986 </state> 932 </state>
987 </provider> 933 </provider>
988 </entry> 934 </entry>
989 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">  
990 - <provider selected="true" editor-type-id="text-editor">  
991 - <state relative-caret-position="280">  
992 - <caret line="154" column="66" lean-forward="false" selection-start-line="154" selection-start-column="66" selection-end-line="154" selection-end-column="66" />  
993 - </state>  
994 - </provider>  
995 - </entry>  
996 <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php"> 935 <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
997 <provider selected="true" editor-type-id="text-editor"> 936 <provider selected="true" editor-type-id="text-editor">
998 <state relative-caret-position="0"> 937 <state relative-caret-position="0">
@@ -1198,7 +1137,6 @@ @@ -1198,7 +1137,6 @@
1198 <provider selected="true" editor-type-id="text-editor"> 1137 <provider selected="true" editor-type-id="text-editor">
1199 <state relative-caret-position="-375"> 1138 <state relative-caret-position="-375">
1200 <caret line="28" column="9" lean-forward="false" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" /> 1139 <caret line="28" column="9" lean-forward="false" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
1201 - <folding />  
1202 </state> 1140 </state>
1203 </provider> 1141 </provider>
1204 </entry> 1142 </entry>
@@ -1206,7 +1144,6 @@ @@ -1206,7 +1144,6 @@
1206 <provider selected="true" editor-type-id="text-editor"> 1144 <provider selected="true" editor-type-id="text-editor">
1207 <state relative-caret-position="-149"> 1145 <state relative-caret-position="-149">
1208 <caret line="16" column="3" lean-forward="false" selection-start-line="16" selection-start-column="3" selection-end-line="16" selection-end-column="3" /> 1146 <caret line="16" column="3" lean-forward="false" selection-start-line="16" selection-start-column="3" selection-end-line="16" selection-end-column="3" />
1209 - <folding />  
1210 </state> 1147 </state>
1211 </provider> 1148 </provider>
1212 </entry> 1149 </entry>
@@ -1214,14 +1151,196 @@ @@ -1214,14 +1151,196 @@
1214 <provider selected="true" editor-type-id="text-editor"> 1151 <provider selected="true" editor-type-id="text-editor">
1215 <state relative-caret-position="-1249"> 1152 <state relative-caret-position="-1249">
1216 <caret line="35" column="5" lean-forward="true" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" /> 1153 <caret line="35" column="5" lean-forward="true" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
  1154 + </state>
  1155 + </provider>
  1156 + </entry>
  1157 + <entry file="file://$PROJECT_DIR$/vendor/symfony/http-foundation/Response.php">
  1158 + <provider selected="true" editor-type-id="text-editor">
  1159 + <state relative-caret-position="300">
  1160 + <caret line="372" column="20" lean-forward="false" selection-start-line="372" selection-start-column="20" selection-end-line="372" selection-end-column="20" />
  1161 + </state>
  1162 + </provider>
  1163 + </entry>
  1164 + <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
  1165 + <provider selected="true" editor-type-id="text-editor">
  1166 + <state relative-caret-position="675">
  1167 + <caret line="335" column="5" lean-forward="false" selection-start-line="335" selection-start-column="5" selection-end-line="335" selection-end-column="5" />
  1168 + <folding>
  1169 + <element signature="e#706#1019#0#PHP" expanded="false" />
  1170 + <element signature="e#1024#3100#0#PHP" expanded="false" />
  1171 + <element signature="e#3106#3426#0#PHP" expanded="false" />
  1172 + <element signature="e#3431#5630#0#PHP" expanded="false" />
  1173 + <element signature="e#5636#6050#0#PHP" expanded="false" />
  1174 + <element signature="e#6055#16076#0#PHP" expanded="false" />
  1175 + <element signature="e#7031#16009#0#PHP" expanded="false" />
  1176 + <element signature="e#16083#16400#0#PHP" expanded="false" />
  1177 + <element signature="e#16405#16883#0#PHP" expanded="false" />
  1178 + <element signature="e#16900#17197#0#PHP" expanded="false" />
  1179 + <element signature="e#17202#17595#0#PHP" expanded="false" />
  1180 + <element signature="e#17622#20883#0#PHP" expanded="false" />
  1181 + <element signature="e#20912#23550#0#PHP" expanded="false" />
  1182 + <element signature="e#23583#29910#0#PHP" expanded="false" />
  1183 + <element signature="e#24378#29668#0#PHP" expanded="false" />
  1184 + <element signature="e#29933#30150#0#PHP" expanded="false" />
  1185 + </folding>
  1186 + </state>
  1187 + </provider>
  1188 + </entry>
  1189 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
  1190 + <provider selected="true" editor-type-id="text-editor">
  1191 + <state relative-caret-position="205">
  1192 + <caret line="250" column="9" lean-forward="true" selection-start-line="250" selection-start-column="9" selection-end-line="250" selection-end-column="9" />
1217 <folding /> 1193 <folding />
1218 </state> 1194 </state>
1219 </provider> 1195 </provider>
1220 </entry> 1196 </entry>
1221 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php"> 1197 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
  1198 + <provider selected="true" editor-type-id="text-editor">
  1199 + <state relative-caret-position="250">
  1200 + <caret line="31" column="98" lean-forward="false" selection-start-line="31" selection-start-column="65" selection-end-line="31" selection-end-column="98" />
  1201 + <folding />
  1202 + </state>
  1203 + </provider>
  1204 + </entry>
  1205 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
  1206 + <provider selected="true" editor-type-id="text-editor">
  1207 + <state relative-caret-position="-118">
  1208 + <caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
  1209 + <folding>
  1210 + <element signature="e#700#2169#0#PHP" expanded="false" />
  1211 + <element signature="e#2201#6736#0#PHP" expanded="false" />
  1212 + </folding>
  1213 + </state>
  1214 + </provider>
  1215 + </entry>
  1216 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
  1217 + <provider selected="true" editor-type-id="text-editor">
  1218 + <state relative-caret-position="304">
  1219 + <caret line="796" column="0" lean-forward="true" selection-start-line="796" selection-start-column="0" selection-end-line="796" selection-end-column="0" />
  1220 + <folding>
  1221 + <element signature="e#4287#4721#0#PHP" expanded="false" />
  1222 + <element signature="e#4726#5084#0#PHP" expanded="false" />
  1223 + <element signature="e#5090#5497#0#PHP" expanded="false" />
  1224 + <element signature="e#5502#5845#0#PHP" expanded="false" />
  1225 + <element signature="e#5851#6264#0#PHP" expanded="false" />
  1226 + <element signature="e#6269#6586#0#PHP" expanded="false" />
  1227 + <element signature="e#6592#7691#0#PHP" expanded="false" />
  1228 + <element signature="e#7696#14874#0#PHP" expanded="false" />
  1229 + <element signature="e#7970#8064#0#PHP" expanded="false" />
  1230 + <element signature="e#8127#12429#0#PHP" expanded="false" />
  1231 + <element signature="e#8450#9749#0#PHP" expanded="false" />
  1232 + <element signature="e#12495#12928#0#PHP" expanded="false" />
  1233 + <element signature="e#12991#13400#0#PHP" expanded="false" />
  1234 + <element signature="e#13464#13734#0#PHP" expanded="false" />
  1235 + <element signature="e#13744#14868#0#PHP" expanded="false" />
  1236 + <element signature="e#14319#14868#0#PHP" expanded="false" />
  1237 + <element signature="e#14880#15560#0#PHP" expanded="false" />
  1238 + <element signature="e#15565#16423#0#PHP" expanded="false" />
  1239 + <element signature="e#16429#17218#0#PHP" expanded="false" />
  1240 + <element signature="e#17223#18572#0#PHP" expanded="false" />
  1241 + <element signature="e#18578#19280#0#PHP" expanded="false" />
  1242 + <element signature="e#19285#20605#0#PHP" expanded="false" />
  1243 + <element signature="e#20611#21187#0#PHP" expanded="false" />
  1244 + <element signature="e#21192#21804#0#PHP" expanded="false" />
  1245 + <element signature="e#21810#22526#0#PHP" expanded="false" />
  1246 + <element signature="e#22531#27399#0#PHP" expanded="false" />
  1247 + <element signature="e#27408#28338#0#PHP" expanded="false" />
  1248 + <element signature="e#28343#33484#0#PHP" expanded="false" />
  1249 + <element signature="e#33490#33867#0#PHP" expanded="false" />
  1250 + <element signature="e#33872#34311#0#PHP" expanded="false" />
  1251 + <element signature="e#34317#35138#0#PHP" expanded="false" />
  1252 + <element signature="e#35143#38547#0#PHP" expanded="false" />
  1253 + <element signature="e#38553#39058#0#PHP" expanded="false" />
  1254 + <element signature="e#39063#39314#0#PHP" expanded="false" />
  1255 + <element signature="e#39320#39799#0#PHP" expanded="false" />
  1256 + <element signature="e#39804#40561#0#PHP" expanded="false" />
  1257 + <element signature="e#40567#41048#0#PHP" expanded="false" />
  1258 + <element signature="e#41053#41923#0#PHP" expanded="false" />
  1259 + <element signature="e#41929#42292#0#PHP" expanded="false" />
  1260 + <element signature="e#42297#42488#0#PHP" expanded="false" />
  1261 + <element signature="e#42494#42852#0#PHP" expanded="false" />
  1262 + <element signature="e#42857#43048#0#PHP" expanded="false" />
  1263 + <element signature="e#43054#44197#0#PHP" expanded="false" />
  1264 + <element signature="e#44202#46867#0#PHP" expanded="false" />
  1265 + <element signature="e#46873#47371#0#PHP" expanded="false" />
  1266 + <element signature="e#47376#49122#0#PHP" expanded="false" />
  1267 + <element signature="e#49128#49541#0#PHP" expanded="false" />
  1268 + <element signature="e#49546#50025#0#PHP" expanded="false" />
  1269 + <element signature="e#50031#50565#0#PHP" expanded="false" />
  1270 + <element signature="e#50570#51955#0#PHP" expanded="false" />
  1271 + <element signature="e#51961#52615#0#PHP" expanded="false" />
  1272 + <element signature="e#52620#54635#0#PHP" expanded="false" />
  1273 + <element signature="e#54641#55401#0#PHP" expanded="false" />
  1274 + <element signature="e#55406#58115#0#PHP" expanded="false" />
  1275 + <element signature="e#58141#58972#0#PHP" expanded="false" />
  1276 + <element signature="e#58978#59398#0#PHP" expanded="false" />
  1277 + <element signature="e#59403#59886#0#PHP" expanded="false" />
  1278 + <element signature="e#59892#60698#0#PHP" expanded="false" />
  1279 + <element signature="e#60703#63861#0#PHP" expanded="false" />
  1280 + <element signature="e#63876#65211#0#PHP" expanded="false" />
  1281 + <element signature="e#65227#66261#0#PHP" expanded="false" />
  1282 + <element signature="e#66267#67025#0#PHP" expanded="false" />
  1283 + <element signature="e#67030#70773#0#PHP" expanded="false" />
  1284 + <element signature="e#70779#71171#0#PHP" expanded="false" />
  1285 + <element signature="e#71176#72128#0#PHP" expanded="false" />
  1286 + <element signature="e#72152#72725#0#PHP" expanded="false" />
  1287 + <element signature="e#72731#73330#0#PHP" expanded="false" />
  1288 + <element signature="e#73335#74262#0#PHP" expanded="false" />
  1289 + <element signature="e#74268#74982#0#PHP" expanded="false" />
  1290 + <element signature="e#74988#75415#0#PHP" expanded="false" />
  1291 + <element signature="e#75420#75889#0#PHP" expanded="false" />
  1292 + <element signature="e#75896#77101#0#PHP" expanded="false" />
  1293 + <element signature="e#77106#78809#0#PHP" expanded="false" />
  1294 + <element signature="e#78815#79592#0#PHP" expanded="false" />
  1295 + <element signature="e#79597#83535#0#PHP" expanded="false" />
  1296 + <element signature="e#83541#84050#0#PHP" expanded="false" />
  1297 + <element signature="e#84055#84727#0#PHP" expanded="false" />
  1298 + <element signature="e#84733#84972#0#PHP" expanded="false" />
  1299 + <element signature="e#84977#85060#0#PHP" expanded="false" />
  1300 + </folding>
  1301 + </state>
  1302 + </provider>
  1303 + </entry>
  1304 + <entry file="file://$PROJECT_DIR$/application/admin/model/User.php">
  1305 + <provider selected="true" editor-type-id="text-editor">
  1306 + <state relative-caret-position="275">
  1307 + <caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
  1308 + <folding>
  1309 + <element signature="e#619#1611#0#PHP" expanded="false" />
  1310 + </folding>
  1311 + </state>
  1312 + </provider>
  1313 + </entry>
  1314 + <entry file="file://$PROJECT_DIR$/application/admin/view/user/user/index.html">
  1315 + <provider selected="true" editor-type-id="text-editor">
  1316 + <state relative-caret-position="75">
  1317 + <caret line="3" column="51" lean-forward="false" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />
  1318 + <folding>
  1319 + <element signature="n#div#1;n#div#0;n#!!top" expanded="false" />
  1320 + </folding>
  1321 + </state>
  1322 + </provider>
  1323 + </entry>
  1324 + <entry file="file://$PROJECT_DIR$/application/admin/controller/user/User.php">
1222 <provider selected="true" editor-type-id="text-editor"> 1325 <provider selected="true" editor-type-id="text-editor">
1223 <state relative-caret-position="375"> 1326 <state relative-caret-position="375">
1224 - <caret line="60" column="44" lean-forward="true" selection-start-line="60" selection-start-column="44" selection-end-line="60" selection-end-column="44" /> 1327 + <caret line="27" column="39" lean-forward="false" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="39" />
  1328 + <folding />
  1329 + </state>
  1330 + </provider>
  1331 + </entry>
  1332 + <entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html">
  1333 + <provider selected="true" editor-type-id="text-editor">
  1334 + <state relative-caret-position="525">
  1335 + <caret line="21" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
  1336 + <folding />
  1337 + </state>
  1338 + </provider>
  1339 + </entry>
  1340 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
  1341 + <provider selected="true" editor-type-id="text-editor">
  1342 + <state relative-caret-position="350">
  1343 + <caret line="59" column="36" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="294" selection-end-column="0" />
1225 <folding> 1344 <folding>
1226 <marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." /> 1345 <marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." />
1227 <marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." /> 1346 <marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." />
@@ -1419,128 +1538,45 @@ @@ -1419,128 +1538,45 @@
1419 </state> 1538 </state>
1420 </provider> 1539 </provider>
1421 </entry> 1540 </entry>
1422 - <entry file="file://$PROJECT_DIR$/application/admin/controller/user/User.php"> 1541 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
1423 <provider selected="true" editor-type-id="text-editor"> 1542 <provider selected="true" editor-type-id="text-editor">
1424 - <state relative-caret-position="450">  
1425 - <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" /> 1543 + <state relative-caret-position="350">
  1544 + <caret line="14" column="15" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="78" selection-end-column="3" />
  1545 + <folding />
1426 </state> 1546 </state>
1427 </provider> 1547 </provider>
1428 </entry> 1548 </entry>
1429 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js"> 1549 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js">
1430 <provider selected="true" editor-type-id="text-editor"> 1550 <provider selected="true" editor-type-id="text-editor">
1431 - <state relative-caret-position="500">  
1432 - <caret line="44" column="131" lean-forward="true" selection-start-line="44" selection-start-column="131" selection-end-line="44" selection-end-column="131" /> 1551 + <state relative-caret-position="375">
  1552 + <caret line="51" column="54" lean-forward="false" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
  1553 + <folding />
1433 </state> 1554 </state>
1434 </provider> 1555 </provider>
1435 </entry> 1556 </entry>
1436 - <entry file="file://$PROJECT_DIR$/vendor/symfony/http-foundation/Response.php"> 1557 + <entry file="file://$PROJECT_DIR$/application/admin/controller/OrderDetail.php">
1437 <provider selected="true" editor-type-id="text-editor"> 1558 <provider selected="true" editor-type-id="text-editor">
1438 - <state relative-caret-position="300">  
1439 - <caret line="372" column="20" lean-forward="false" selection-start-line="372" selection-start-column="20" selection-end-line="372" selection-end-column="20" />  
1440 - <folding /> 1559 + <state relative-caret-position="-50">
  1560 + <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
  1561 + <folding>
  1562 + <element signature="e#40#74#0#PHP" expanded="true" />
  1563 + </folding>
1441 </state> 1564 </state>
1442 </provider> 1565 </provider>
1443 </entry> 1566 </entry>
1444 - <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 1567 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order_detail.js">
1445 <provider selected="true" editor-type-id="text-editor"> 1568 <provider selected="true" editor-type-id="text-editor">
1446 - <state relative-caret-position="218">  
1447 - <caret line="335" column="5" lean-forward="true" selection-start-line="335" selection-start-column="5" selection-end-line="335" selection-end-column="5" />  
1448 - <folding>  
1449 - <element signature="e#706#1019#0#PHP" expanded="false" />  
1450 - <element signature="e#1024#3100#0#PHP" expanded="false" />  
1451 - <element signature="e#3106#3426#0#PHP" expanded="false" />  
1452 - <element signature="e#3431#5630#0#PHP" expanded="false" />  
1453 - <element signature="e#5636#6050#0#PHP" expanded="false" />  
1454 - <element signature="e#6055#16076#0#PHP" expanded="false" />  
1455 - <element signature="e#7031#16009#0#PHP" expanded="false" />  
1456 - <element signature="e#16083#16400#0#PHP" expanded="false" />  
1457 - <element signature="e#16405#16883#0#PHP" expanded="false" />  
1458 - <element signature="e#16900#17197#0#PHP" expanded="false" />  
1459 - <element signature="e#17202#17595#0#PHP" expanded="false" />  
1460 - <element signature="e#17622#20883#0#PHP" expanded="false" />  
1461 - <element signature="e#20912#23550#0#PHP" expanded="false" />  
1462 - <element signature="e#23583#29910#0#PHP" expanded="false" />  
1463 - <element signature="e#24378#29668#0#PHP" expanded="false" />  
1464 - <element signature="e#29933#30150#0#PHP" expanded="false" />  
1465 - </folding> 1569 + <state relative-caret-position="475">
  1570 + <caret line="28" column="78" lean-forward="true" selection-start-line="28" selection-start-column="78" selection-end-line="28" selection-end-column="78" />
  1571 + <folding />
1466 </state> 1572 </state>
1467 </provider> 1573 </provider>
1468 </entry> 1574 </entry>
1469 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 1575 + <entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html">
1470 <provider selected="true" editor-type-id="text-editor"> 1576 <provider selected="true" editor-type-id="text-editor">
1471 - <state relative-caret-position="718">  
1472 - <caret line="2422" column="1" lean-forward="true" selection-start-line="2422" selection-start-column="1" selection-end-line="2422" selection-end-column="1" />  
1473 - <folding>  
1474 - <element signature="e#4287#4721#0#PHP" expanded="false" />  
1475 - <element signature="e#4726#5084#0#PHP" expanded="false" />  
1476 - <element signature="e#5090#5497#0#PHP" expanded="false" />  
1477 - <element signature="e#5502#5845#0#PHP" expanded="false" />  
1478 - <element signature="e#5851#6264#0#PHP" expanded="false" />  
1479 - <element signature="e#6269#6586#0#PHP" expanded="false" />  
1480 - <element signature="e#6592#7691#0#PHP" expanded="false" />  
1481 - <element signature="e#7696#13097#0#PHP" expanded="false" />  
1482 - <element signature="e#13103#13783#0#PHP" expanded="false" />  
1483 - <element signature="e#13788#14646#0#PHP" expanded="false" />  
1484 - <element signature="e#14652#15441#0#PHP" expanded="false" />  
1485 - <element signature="e#15446#16795#0#PHP" expanded="false" />  
1486 - <element signature="e#16801#17503#0#PHP" expanded="false" />  
1487 - <element signature="e#17508#18828#0#PHP" expanded="false" />  
1488 - <element signature="e#18834#19410#0#PHP" expanded="false" />  
1489 - <element signature="e#19415#20027#0#PHP" expanded="false" />  
1490 - <element signature="e#20033#20749#0#PHP" expanded="false" />  
1491 - <element signature="e#20754#25622#0#PHP" expanded="false" />  
1492 - <element signature="e#25631#26561#0#PHP" expanded="false" />  
1493 - <element signature="e#26566#31707#0#PHP" expanded="false" />  
1494 - <element signature="e#31713#32090#0#PHP" expanded="false" />  
1495 - <element signature="e#32095#32534#0#PHP" expanded="false" />  
1496 - <element signature="e#32540#33361#0#PHP" expanded="false" />  
1497 - <element signature="e#33366#36770#0#PHP" expanded="false" />  
1498 - <element signature="e#36776#37281#0#PHP" expanded="false" />  
1499 - <element signature="e#37286#37537#0#PHP" expanded="false" />  
1500 - <element signature="e#37543#38022#0#PHP" expanded="false" />  
1501 - <element signature="e#38027#38784#0#PHP" expanded="false" />  
1502 - <element signature="e#38790#39271#0#PHP" expanded="false" />  
1503 - <element signature="e#39276#40146#0#PHP" expanded="false" />  
1504 - <element signature="e#40152#40515#0#PHP" expanded="false" />  
1505 - <element signature="e#40520#40711#0#PHP" expanded="false" />  
1506 - <element signature="e#40717#41075#0#PHP" expanded="false" />  
1507 - <element signature="e#41080#41271#0#PHP" expanded="false" />  
1508 - <element signature="e#41277#42420#0#PHP" expanded="false" />  
1509 - <element signature="e#42425#45090#0#PHP" expanded="false" />  
1510 - <element signature="e#45096#45594#0#PHP" expanded="false" />  
1511 - <element signature="e#45599#47345#0#PHP" expanded="false" />  
1512 - <element signature="e#47351#47764#0#PHP" expanded="false" />  
1513 - <element signature="e#47769#48248#0#PHP" expanded="false" />  
1514 - <element signature="e#48254#48788#0#PHP" expanded="false" />  
1515 - <element signature="e#48793#50178#0#PHP" expanded="false" />  
1516 - <element signature="e#50184#50838#0#PHP" expanded="false" />  
1517 - <element signature="e#50843#52858#0#PHP" expanded="false" />  
1518 - <element signature="e#52864#53624#0#PHP" expanded="false" />  
1519 - <element signature="e#53629#56338#0#PHP" expanded="false" />  
1520 - <element signature="e#56364#57195#0#PHP" expanded="false" />  
1521 - <element signature="e#57201#57621#0#PHP" expanded="false" />  
1522 - <element signature="e#57626#58109#0#PHP" expanded="false" />  
1523 - <element signature="e#58115#58921#0#PHP" expanded="false" />  
1524 - <element signature="e#58926#62084#0#PHP" expanded="false" />  
1525 - <element signature="e#62099#63434#0#PHP" expanded="false" />  
1526 - <element signature="e#63450#64484#0#PHP" expanded="false" />  
1527 - <element signature="e#64490#65248#0#PHP" expanded="false" />  
1528 - <element signature="e#65253#68996#0#PHP" expanded="false" />  
1529 - <element signature="e#69002#69394#0#PHP" expanded="false" />  
1530 - <element signature="e#69399#70351#0#PHP" expanded="false" />  
1531 - <element signature="e#70375#70948#0#PHP" expanded="false" />  
1532 - <element signature="e#70954#71553#0#PHP" expanded="false" />  
1533 - <element signature="e#71558#72485#0#PHP" expanded="false" />  
1534 - <element signature="e#72491#73205#0#PHP" expanded="false" />  
1535 - <element signature="e#73211#73638#0#PHP" expanded="false" />  
1536 - <element signature="e#73643#74112#0#PHP" expanded="false" />  
1537 - <element signature="e#74119#75324#0#PHP" expanded="false" />  
1538 - <element signature="e#75329#77032#0#PHP" expanded="false" />  
1539 - <element signature="e#77038#77815#0#PHP" expanded="false" />  
1540 - <element signature="e#77820#81758#0#PHP" expanded="false" />  
1541 - <element signature="e#81764#82273#0#PHP" expanded="false" />  
1542 - <element signature="e#82278#82950#0#PHP" expanded="false" />  
1543 - </folding> 1577 + <state relative-caret-position="100">
  1578 + <caret line="4" column="51" lean-forward="true" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />
  1579 + <folding />
1544 </state> 1580 </state>
1545 </provider> 1581 </provider>
1546 </entry> 1582 </entry>
  1 +<?php
  2 +
  3 +namespace app\admin\controller;
  4 +
  5 +use app\common\controller\Backend;
  6 +use think\Db;
  7 +
  8 +/**
  9 + * 图片订单管理
  10 + *
  11 + * @icon fa fa-circle-o
  12 + */
  13 +class OrderDetail extends Backend
  14 +{
  15 +
  16 + /**
  17 + * Order模型对象
  18 + * @var \app\admin\model\Order
  19 + */
  20 + protected $model = null;
  21 +
  22 + public function _initialize()
  23 + {
  24 + parent::_initialize();
  25 + $this->model = new \app\admin\model\Order;
  26 +
  27 + }
  28 +
  29 + /**
  30 + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
  31 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
  32 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
  33 + */
  34 +
  35 +
  36 + /**
  37 + * 查看
  38 + */
  39 + public function index($ids = null)
  40 + {
  41 + //当前是否为关联查询
  42 + $this->relationSearch = true;
  43 + //设置过滤方法
  44 + $this->request->filter(['strip_tags']);
  45 + if ($this->request->isAjax())
  46 + {
  47 + //如果发送的来源是Selectpage，则转发到Selectpage
  48 + if ($this->request->request('keyField'))
  49 + {
  50 + return $this->selectpage();
  51 + }
  52 + list($where, $sort, $order, $offset, $limit) = $this->buildparams();
  53 + $total = $this->model
  54 + ->with(['user'])
  55 + ->where('user_id',$ids)
  56 + ->where($where)
  57 + ->order($sort, $order)
  58 + ->count();
  59 +
  60 + $list = $this->model
  61 + ->with(['user'])
  62 + ->where('user_id',$ids)
  63 + ->where($where)
  64 + ->order($sort, $order)
  65 + ->limit($offset, $limit)
  66 + ->select();
  67 +
  68 + foreach ($list as $row) {
  69 +
  70 +
  71 + }
  72 + $list = collection($list)->toArray();
  73 + $type = new \app\admin\model\Pic();
  74 + $video = new \app\admin\model\Video();
  75 + foreach ($list as &$v){
  76 + $type_ids = $type->whereIn('id',$v['pic_id'])->column('title');
  77 + if(!empty($v['video_id'])){
  78 + $a = [];
  79 + $v['video_id'] = unserialize($v['video_id']);
  80 + foreach ($v['video_id'] as &$v1){
  81 + //获取视频标题
  82 + $v1['id'] = $video->where('id',$v1['id'])->column('title');
  83 + //判断视频属性
  84 + if($v1['attr'] == 1){
  85 + $v1['attr'] = '2k';
  86 + }elseif ($v1['attr'] == 2){
  87 + $v1['attr'] = '4k';
  88 + }else{
  89 + $v1['attr'] = '8k';
  90 + }
  91 + array_push($a,$v1['id']);
  92 + }
  93 + $v['video_id'] = $a;
  94 + }
  95 + $v['pic_id'] = trim(implode(',',$type_ids),',');
  96 + }
  97 + $result = array("total" => $total, "rows" => $list);
  98 + return json($result);
  99 + }
  100 + $this->assignconfig('ids',$ids);
  101 + return $this->view->fetch();
  102 + }
  103 +}
@@ -24,6 +24,8 @@ class User extends Backend @@ -24,6 +24,8 @@ class User extends Backend
24 { 24 {
25 parent::_initialize(); 25 parent::_initialize();
26 $this->model = model('User'); 26 $this->model = model('User');
  27 +
  28 + $this->view->assign("statusList", $this->model->getStatusList1());
27 } 29 }
28 30
29 /** 31 /**
@@ -22,6 +22,11 @@ class User extends Model @@ -22,6 +22,11 @@ class User extends Model
22 'jointime_text' 22 'jointime_text'
23 ]; 23 ];
24 24
  25 + public function getStatusList1()
  26 + {
  27 + return ['0' => __('非会员'),'1' => __('会员列表')];
  28 + }
  29 +
25 public function getOriginData() 30 public function getOriginData()
26 { 31 {
27 return $this->origin; 32 return $this->origin;
  1 +<div class="panel panel-default panel-intro">
  2 + {:build_heading()}
  3 +
  4 + <div class="panel-body">
  5 + <div id="myTabContent" class="tab-content">
  6 + <div class="tab-pane fade active in" id="one">
  7 + <div class="widget-body no-padding">
  8 + <div id="toolbar" class="toolbar">
  9 + <!--<a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>-->
  10 + <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
  11 + <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('order/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
  12 + <!--<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
  13 + <!--<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('order/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
  14 +
  15 + <!--<div class="dropdown btn-group {:$auth->check('order/multi')?'':'hide'}">-->
  16 + <!--<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
  17 + <!--<ul class="dropdown-menu text-left" role="menu">-->
  18 + <!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
  19 + <!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
  20 + <!--</ul>-->
  21 + <!--</div>-->
  22 +
  23 +
  24 + </div>
  25 + <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
  26 + data-operate-edit="{:$auth->check('order/edit')}"
  27 + data-operate-del="{:$auth->check('order/del')}"
  28 + width="100%">
  29 + </table>
  30 + </div>
  31 + </div>
  32 +
  33 + </div>
  34 + </div>
  35 +</div>
1 <div class="panel panel-default panel-intro"> 1 <div class="panel panel-default panel-intro">
2 - {:build_heading()} 2 + <div class="panel-heading">
  3 + {:build_heading(null,FALSE)}
  4 + <ul class="nav nav-tabs" data-field="is_vip">
  5 + <li class="active"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
  6 + {foreach name="statusList" item="vo"}
  7 + <li><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
  8 + {/foreach}
  9 + </ul>
  10 + </div>
3 11
4 <div class="panel-body"> 12 <div class="panel-body">
5 <div id="myTabContent" class="tab-content"> 13 <div id="myTabContent" class="tab-content">
@@ -7776,7 +7776,7 @@ @@ -7776,7 +7776,7 @@
7776 7776
7777 <div class="row mt0 footer"> 7777 <div class="row mt0 footer">
7778 <div class="col-md-6" align="left"> 7778 <div class="col-md-6" align="left">
7779 - Generated on 2020-05-22 17:03:23 </div> 7779 + Generated on 2020-05-23 16:08:46 </div>
7780 <div class="col-md-6" align="right"> 7780 <div class="col-md-6" align="right">
7781 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 7781 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
7782 </div> 7782 </div>
  1 +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
  2 +
  3 + var Controller = {
  4 + index: function () {
  5 + // 初始化表格参数配置
  6 + Table.api.init({
  7 + extend: {
  8 + index_url: 'order_detail/index' +'/ids/' + Config.ids + location.search,
  9 + add_url: 'order_detail/add',
  10 + edit_url: 'order_detail/edit',
  11 + del_url: 'order_detail/del',
  12 + multi_url: 'order_detail/multi',
  13 + table: 'order_detail',
  14 + }
  15 + });
  16 +
  17 + var table = $("#table");
  18 +
  19 + // 初始化表格
  20 + table.bootstrapTable({
  21 + url: $.fn.bootstrapTable.defaults.extend.index_url,
  22 + pk: 'id',
  23 + sortName: 'id',
  24 + columns: [
  25 + [
  26 + {field: 'id', title: __('Id'), operate:false},
  27 + {field: 'user.nickname', title: __('昵称')},
  28 + {field: 'pic_id', title: __('图片素材'), operate:false},
  29 + {field: 'video_id', title: __('视频素材'), operate:false},
  30 + {field: 'total', title: __('总价'), operate:'BETWEEN'},
  31 + {field: 'status', title: __('Status'),formatter: Table.api.formatter.status,searchList:{'1': '待支付', '2': '已完成'}},
  32 + {field: 'num', title: __('订单号'), operate:false},
  33 + // {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
  34 + // {field: 'paytime', title: __('Paytime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
  35 + // {field: 'user.is_vip', title: __('User.is_vip'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}}
  36 + ]
  37 + ]
  38 + });
  39 +
  40 + // 为表格绑定事件
  41 + Table.api.bindevent(table);
  42 + },
  43 + add: function () {
  44 + Controller.api.bindevent();
  45 + },
  46 + edit: function () {
  47 + Controller.api.bindevent();
  48 + },
  49 + api: {
  50 + bindevent: function () {
  51 + Form.api.bindevent($("form[role=form]"));
  52 + }
  53 + }
  54 + };
  55 + return Controller;
  56 +});
@@ -42,6 +42,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -42,6 +42,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
42 {field: 'joinip', title: __('Joinip'), formatter: Table.api.formatter.search}, 42 {field: 'joinip', title: __('Joinip'), formatter: Table.api.formatter.search},
43 {field: 'status', title: __('Status'), formatter: Table.api.formatter.status, searchList: {normal: __('Normal'), hidden: __('Hidden')}}, 43 {field: 'status', title: __('Status'), formatter: Table.api.formatter.status, searchList: {normal: __('Normal'), hidden: __('Hidden')}},
44 {field: 'money', title: __('账号余额')}, 44 {field: 'money', title: __('账号余额')},
  45 + {field: 'id', title: __('按钮组'), table: table, events: Table.api.events.operate, buttons:
  46 + [
  47 + {
  48 + text: '购买信息列表',
  49 + title: '购买信息列表',
  50 + icon: 'fa fa-list',
  51 + classname: 'btn btn-xs btn-primary btn-dialog',
  52 + url: 'order_detail/index',
  53 + extend: 'data-area=\'["80%","80%"]\'',
  54 + }
  55 + ], operate:false, formatter: Table.api.formatter.buttons
  56 + },
45 {field: 'is_vip', title: __('是否为会员'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}}, 57 {field: 'is_vip', title: __('是否为会员'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}},
46 // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 58 // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
47 ] 59 ]