正在显示
4 个修改的文件
包含
313 行增加
和
354 行删除
@@ -5,15 +5,10 @@ | @@ -5,15 +5,10 @@ | ||
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" /> | ||
11 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | 8 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> |
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" /> | ||
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" /> | 9 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" /> |
10 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/order/index.html" afterPath="$PROJECT_DIR$/application/admin/view/order/index.html" /> | ||
11 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/order.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/order.js" /> | ||
17 | </list> | 12 | </list> |
18 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 13 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
19 | <option name="TRACKING_ENABLED" value="true" /> | 14 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -23,28 +18,7 @@ | @@ -23,28 +18,7 @@ | ||
23 | <option name="LAST_RESOLUTION" value="IGNORE" /> | 18 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
24 | </component> | 19 | </component> |
25 | <component name="FileEditorManager"> | 20 | <component name="FileEditorManager"> |
26 | - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | ||
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"> | ||
29 | - <provider selected="true" editor-type-id="text-editor"> | ||
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 /> | ||
33 | - </state> | ||
34 | - </provider> | ||
35 | - </entry> | ||
36 | - </file> | ||
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"> | ||
39 | - <provider selected="true" editor-type-id="text-editor"> | ||
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 /> | ||
43 | - </state> | ||
44 | - </provider> | ||
45 | - </entry> | ||
46 | - </file> | ||
47 | - </leaf> | 21 | + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" /> |
48 | </component> | 22 | </component> |
49 | <component name="FileTemplateManagerImpl"> | 23 | <component name="FileTemplateManagerImpl"> |
50 | <option name="RECENT_TEMPLATES"> | 24 | <option name="RECENT_TEMPLATES"> |
@@ -88,8 +62,6 @@ | @@ -88,8 +62,6 @@ | ||
88 | <component name="IdeDocumentHistory"> | 62 | <component name="IdeDocumentHistory"> |
89 | <option name="CHANGED_PATHS"> | 63 | <option name="CHANGED_PATHS"> |
90 | <list> | 64 | <list> |
91 | - <option value="$PROJECT_DIR$/public/assets/js/backend/cover.js" /> | ||
92 | - <option value="$PROJECT_DIR$/application/admin/view/words/index.html" /> | ||
93 | <option value="$PROJECT_DIR$/application/admin/model/Video.php" /> | 65 | <option value="$PROJECT_DIR$/application/admin/model/Video.php" /> |
94 | <option value="$PROJECT_DIR$/application/admin/view/addword/index.html" /> | 66 | <option value="$PROJECT_DIR$/application/admin/view/addword/index.html" /> |
95 | <option value="$PROJECT_DIR$/application/admin/controller/Addword.php" /> | 67 | <option value="$PROJECT_DIR$/application/admin/controller/Addword.php" /> |
@@ -109,7 +81,6 @@ | @@ -109,7 +81,6 @@ | ||
109 | <option value="$PROJECT_DIR$/application/admin/view/share/edit.html" /> | 81 | <option value="$PROJECT_DIR$/application/admin/view/share/edit.html" /> |
110 | <option value="$PROJECT_DIR$/application/admin/view/share/index.html" /> | 82 | <option value="$PROJECT_DIR$/application/admin/view/share/index.html" /> |
111 | <option value="$PROJECT_DIR$/public/assets/js/backend/share.js" /> | 83 | <option value="$PROJECT_DIR$/public/assets/js/backend/share.js" /> |
112 | - <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> | ||
113 | <option value="$PROJECT_DIR$/application/common/controller/Api.php" /> | 84 | <option value="$PROJECT_DIR$/application/common/controller/Api.php" /> |
114 | <option value="$PROJECT_DIR$/application/common/library/Token.php" /> | 85 | <option value="$PROJECT_DIR$/application/common/library/Token.php" /> |
115 | <option value="$PROJECT_DIR$/application/common/library/Auth.php" /> | 86 | <option value="$PROJECT_DIR$/application/common/library/Auth.php" /> |
@@ -126,7 +97,6 @@ | @@ -126,7 +97,6 @@ | ||
126 | <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" /> | 97 | <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" /> |
127 | <option value="$PROJECT_DIR$/application/admin/library/Auth.php" /> | 98 | <option value="$PROJECT_DIR$/application/admin/library/Auth.php" /> |
128 | <option value="$PROJECT_DIR$/application/admin/controller/Index.php" /> | 99 | <option value="$PROJECT_DIR$/application/admin/controller/Index.php" /> |
129 | - <option value="$PROJECT_DIR$/application/config.php" /> | ||
130 | <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> | 100 | <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> |
131 | <option value="$PROJECT_DIR$/application/api/controller/User.php" /> | 101 | <option value="$PROJECT_DIR$/application/api/controller/User.php" /> |
132 | <option value="$PROJECT_DIR$/application/admin/model/User.php" /> | 102 | <option value="$PROJECT_DIR$/application/admin/model/User.php" /> |
@@ -139,6 +109,10 @@ | @@ -139,6 +109,10 @@ | ||
139 | <option value="$PROJECT_DIR$/application/admin/controller/OrderDetail.php" /> | 109 | <option value="$PROJECT_DIR$/application/admin/controller/OrderDetail.php" /> |
140 | <option value="$PROJECT_DIR$/public/assets/js/backend/order_detail.js" /> | 110 | <option value="$PROJECT_DIR$/public/assets/js/backend/order_detail.js" /> |
141 | <option value="$PROJECT_DIR$/application/admin/view/order_detail/index.html" /> | 111 | <option value="$PROJECT_DIR$/application/admin/view/order_detail/index.html" /> |
112 | + <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" /> | ||
113 | + <option value="$PROJECT_DIR$/application/admin/view/order/index.html" /> | ||
114 | + <option value="$PROJECT_DIR$/application/config.php" /> | ||
115 | + <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> | ||
142 | </list> | 116 | </list> |
143 | </option> | 117 | </option> |
144 | </component> | 118 | </component> |
@@ -156,11 +130,10 @@ | @@ -156,11 +130,10 @@ | ||
156 | <sorting>DEFINITION_ORDER</sorting> | 130 | <sorting>DEFINITION_ORDER</sorting> |
157 | </component> | 131 | </component> |
158 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 132 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
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" /> | 133 | + <component name="ProjectFrameBounds" extendedState="1"> |
134 | + <option name="x" value="149" /> | ||
135 | + <option name="width" value="1747" /> | ||
136 | + <option name="height" value="1010" /> | ||
164 | </component> | 137 | </component> |
165 | <component name="ProjectView"> | 138 | <component name="ProjectView"> |
166 | <navigator currentView="ProjectPane" proportions="" version="1"> | 139 | <navigator currentView="ProjectPane" proportions="" version="1"> |
@@ -189,69 +162,6 @@ | @@ -189,69 +162,6 @@ | ||
189 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | 162 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> |
190 | <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | 163 | <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> |
191 | </path> | 164 | </path> |
192 | - <path> | ||
193 | - <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
194 | - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
195 | - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
196 | - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
197 | - </path> | ||
198 | - <path> | ||
199 | - <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
200 | - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
201 | - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
202 | - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
203 | - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
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> | ||
255 | </expand> | 165 | </expand> |
256 | <select /> | 166 | <select /> |
257 | </subPane> | 167 | </subPane> |
@@ -262,7 +172,7 @@ | @@ -262,7 +172,7 @@ | ||
262 | </component> | 172 | </component> |
263 | <component name="PropertiesComponent"> | 173 | <component name="PropertiesComponent"> |
264 | <property name="WebServerToolWindowFactoryState" value="false" /> | 174 | <property name="WebServerToolWindowFactoryState" value="false" /> |
265 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/../fastadmin/questions" /> | 175 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/../fastadmin/room" /> |
266 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> | 176 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> |
267 | <property name="settings.editor.selected.configurable" value="preferences.keymap" /> | 177 | <property name="settings.editor.selected.configurable" value="preferences.keymap" /> |
268 | </component> | 178 | </component> |
@@ -426,7 +336,7 @@ | @@ -426,7 +336,7 @@ | ||
426 | <workItem from="1590137451444" duration="1533000" /> | 336 | <workItem from="1590137451444" duration="1533000" /> |
427 | <workItem from="1590141410628" duration="1864000" /> | 337 | <workItem from="1590141410628" duration="1864000" /> |
428 | <workItem from="1590193431145" duration="1982000" /> | 338 | <workItem from="1590193431145" duration="1982000" /> |
429 | - <workItem from="1590217205221" duration="7795000" /> | 339 | + <workItem from="1590217205221" duration="12032000" /> |
430 | </task> | 340 | </task> |
431 | <task id="LOCAL-00001" summary="调试"> | 341 | <task id="LOCAL-00001" summary="调试"> |
432 | <created>1574145133364</created> | 342 | <created>1574145133364</created> |
@@ -649,7 +559,7 @@ | @@ -649,7 +559,7 @@ | ||
649 | <servers /> | 559 | <servers /> |
650 | </component> | 560 | </component> |
651 | <component name="TimeTrackingManager"> | 561 | <component name="TimeTrackingManager"> |
652 | - <option name="totallyTimeSpent" value="688759000" /> | 562 | + <option name="totallyTimeSpent" value="692996000" /> |
653 | </component> | 563 | </component> |
654 | <component name="TodoView"> | 564 | <component name="TodoView"> |
655 | <todo-panel id="selected-file"> | 565 | <todo-panel id="selected-file"> |
@@ -661,10 +571,9 @@ | @@ -661,10 +571,9 @@ | ||
661 | </todo-panel> | 571 | </todo-panel> |
662 | </component> | 572 | </component> |
663 | <component name="ToolWindowManager"> | 573 | <component name="ToolWindowManager"> |
664 | - <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> | ||
665 | - <editor active="true" /> | 574 | + <frame x="149" y="0" width="1747" height="1010" extended-state="1" /> |
666 | <layout> | 575 | <layout> |
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" /> | 576 | + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14819206" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
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" /> | 577 | <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" /> |
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" /> | 578 | <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" /> |
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" /> | 579 | <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" /> |
@@ -723,13 +632,6 @@ | @@ -723,13 +632,6 @@ | ||
723 | <watches-manager /> | 632 | <watches-manager /> |
724 | </component> | 633 | </component> |
725 | <component name="editorHistoryManager"> | 634 | <component name="editorHistoryManager"> |
726 | - <entry file="file://$PROJECT_DIR$/application/common/library/token/Driver.php"> | ||
727 | - <provider selected="true" editor-type-id="text-editor"> | ||
728 | - <state relative-caret-position="269"> | ||
729 | - <caret line="35" column="22" lean-forward="false" selection-start-line="35" selection-start-column="22" selection-end-line="35" selection-end-column="22" /> | ||
730 | - </state> | ||
731 | - </provider> | ||
732 | - </entry> | ||
733 | <entry file="file://$PROJECT_DIR$/application/common/library/Token.php"> | 635 | <entry file="file://$PROJECT_DIR$/application/common/library/Token.php"> |
734 | <provider selected="true" editor-type-id="text-editor"> | 636 | <provider selected="true" editor-type-id="text-editor"> |
735 | <state relative-caret-position="1462"> | 637 | <state relative-caret-position="1462"> |
@@ -917,14 +819,6 @@ | @@ -917,14 +819,6 @@ | ||
917 | </state> | 819 | </state> |
918 | </provider> | 820 | </provider> |
919 | </entry> | 821 | </entry> |
920 | - <entry file="file://$PROJECT_DIR$/application/config.php"> | ||
921 | - <provider selected="true" editor-type-id="text-editor"> | ||
922 | - <state relative-caret-position="25"> | ||
923 | - <caret line="228" column="22" lean-forward="true" selection-start-line="228" selection-start-column="22" selection-end-line="228" selection-end-column="22" /> | ||
924 | - <folding /> | ||
925 | - </state> | ||
926 | - </provider> | ||
927 | - </entry> | ||
928 | <entry file="file://$PROJECT_DIR$/application/admin/controller/Index.php"> | 822 | <entry file="file://$PROJECT_DIR$/application/admin/controller/Index.php"> |
929 | <provider selected="true" editor-type-id="text-editor"> | 823 | <provider selected="true" editor-type-id="text-editor"> |
930 | <state relative-caret-position="50"> | 824 | <state relative-caret-position="50"> |
@@ -1194,14 +1088,6 @@ | @@ -1194,14 +1088,6 @@ | ||
1194 | </state> | 1088 | </state> |
1195 | </provider> | 1089 | </provider> |
1196 | </entry> | 1090 | </entry> |
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"> | 1091 | <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php"> |
1206 | <provider selected="true" editor-type-id="text-editor"> | 1092 | <provider selected="true" editor-type-id="text-editor"> |
1207 | <state relative-caret-position="-118"> | 1093 | <state relative-caret-position="-118"> |
@@ -1329,238 +1215,53 @@ | @@ -1329,238 +1215,53 @@ | ||
1329 | </state> | 1215 | </state> |
1330 | </provider> | 1216 | </provider> |
1331 | </entry> | 1217 | </entry> |
1332 | - <entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html"> | 1218 | + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js"> |
1333 | <provider selected="true" editor-type-id="text-editor"> | 1219 | <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" /> | 1220 | + <state relative-caret-position="375"> |
1221 | + <caret line="51" column="54" lean-forward="false" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" /> | ||
1336 | <folding /> | 1222 | <folding /> |
1337 | </state> | 1223 | </state> |
1338 | </provider> | 1224 | </provider> |
1339 | </entry> | 1225 | </entry> |
1340 | - <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php"> | 1226 | + <entry file="file://$PROJECT_DIR$/application/admin/controller/OrderDetail.php"> |
1341 | <provider selected="true" editor-type-id="text-editor"> | 1227 | <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" /> | 1228 | + <state relative-caret-position="-50"> |
1229 | + <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" /> | ||
1344 | <folding> | 1230 | <folding> |
1345 | - <marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." /> | ||
1346 | - <marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." /> | ||
1347 | - <marker date="1583590171926" expanded="false" signature="3739:3805" ph="..." /> | ||
1348 | - <marker date="1583590171926" expanded="false" signature="3878:3925" ph="..." /> | ||
1349 | - <marker date="1583590171926" expanded="true" signature="3926:3964" ph="..." /> | ||
1350 | - <marker date="1583590171926" expanded="false" signature="3988:4015" ph="..." /> | ||
1351 | - <marker date="1583590171926" expanded="true" signature="4016:4171" ph="..." /> | ||
1352 | - <marker date="1583590171926" expanded="false" signature="4195:4211" ph="..." /> | ||
1353 | - <marker date="1583590171926" expanded="true" signature="4212:5259" ph="..." /> | ||
1354 | - <marker date="1583590171926" expanded="false" signature="4238:4282" ph="..." /> | ||
1355 | - <marker date="1583590171926" expanded="true" signature="4283:4361" ph="..." /> | ||
1356 | - <marker date="1583590171926" expanded="false" signature="4313:4325" ph="..." /> | ||
1357 | - <marker date="1583590171926" expanded="false" signature="4385:4429" ph="..." /> | ||
1358 | - <marker date="1583590171926" expanded="true" signature="4430:4508" ph="..." /> | ||
1359 | - <marker date="1583590171926" expanded="false" signature="4461:4473" ph="..." /> | ||
1360 | - <marker date="1583590171926" expanded="false" signature="4532:4576" ph="..." /> | ||
1361 | - <marker date="1583590171926" expanded="true" signature="4577:4655" ph="..." /> | ||
1362 | - <marker date="1583590171926" expanded="false" signature="4608:4620" ph="..." /> | ||
1363 | - <marker date="1583590171926" expanded="false" signature="4679:4723" ph="..." /> | ||
1364 | - <marker date="1583590171926" expanded="true" signature="4724:4805" ph="..." /> | ||
1365 | - <marker date="1583590171926" expanded="false" signature="4755:4767" ph="..." /> | ||
1366 | - <marker date="1583590171926" expanded="false" signature="4829:4873" ph="..." /> | ||
1367 | - <marker date="1583590171926" expanded="true" signature="4874:4959" ph="..." /> | ||
1368 | - <marker date="1583590171926" expanded="false" signature="4906:4918" ph="..." /> | ||
1369 | - <marker date="1583590171926" expanded="false" signature="4983:5027" ph="..." /> | ||
1370 | - <marker date="1583590171926" expanded="true" signature="5028:5110" ph="..." /> | ||
1371 | - <marker date="1583590171926" expanded="false" signature="5062:5074" ph="..." /> | ||
1372 | - <marker date="1583590171926" expanded="false" signature="5134:5178" ph="..." /> | ||
1373 | - <marker date="1583590171926" expanded="true" signature="5179:5242" ph="..." /> | ||
1374 | - <marker date="1583590171926" expanded="true" signature="5284:5748" ph="..." /> | ||
1375 | - <marker date="1583590171926" expanded="false" signature="5312:5378" ph="..." /> | ||
1376 | - <marker date="1583590171926" expanded="false" signature="5421:5466" ph="..." /> | ||
1377 | - <marker date="1583590171926" expanded="true" signature="5467:5731" ph="..." /> | ||
1378 | - <marker date="1583590171926" expanded="false" signature="5468:5474" ph=" " /> | ||
1379 | - <marker date="1583590171926" expanded="false" signature="5474:5480" ph=" " /> | ||
1380 | - <marker date="1583590171926" expanded="false" signature="5480:5486" ph=" " /> | ||
1381 | - <marker date="1583590171926" expanded="false" signature="5486:5492" ph=" " /> | ||
1382 | - <marker date="1583590171926" expanded="false" signature="5524:5533" ph="..." /> | ||
1383 | - <marker date="1583590171926" expanded="false" signature="5576:5585" ph="..." /> | ||
1384 | - <marker date="1583590171926" expanded="false" signature="5614:5623" ph="..." /> | ||
1385 | - <marker date="1583590171926" expanded="false" signature="5648:5657" ph="..." /> | ||
1386 | - <marker date="1583590171926" expanded="false" signature="5772:5790" ph="..." /> | ||
1387 | - <marker date="1583590171926" expanded="true" signature="5791:6108" ph="..." /> | ||
1388 | - <marker date="1583590171926" expanded="false" signature="5819:5885" ph="..." /> | ||
1389 | - <marker date="1583590171926" expanded="false" signature="5924:5952" ph="..." /> | ||
1390 | - <marker date="1583590171926" expanded="false" signature="5954:5960" ph=" " /> | ||
1391 | - <marker date="1583590171926" expanded="false" signature="5960:5966" ph=" " /> | ||
1392 | - <marker date="1583590171926" expanded="false" signature="5966:5972" ph=" " /> | ||
1393 | - <marker date="1583590171926" expanded="false" signature="5972:5978" ph=" " /> | ||
1394 | - <marker date="1583590171926" expanded="false" signature="6031:6040" ph="..." /> | ||
1395 | - <marker date="1583590171926" expanded="false" signature="6132:6150" ph="..." /> | ||
1396 | - <marker date="1583590171926" expanded="true" signature="6151:6557" ph="..." /> | ||
1397 | - <marker date="1583590171926" expanded="false" signature="6179:6245" ph="..." /> | ||
1398 | - <marker date="1583590171926" expanded="false" signature="6286:6331" ph="..." /> | ||
1399 | - <marker date="1583590171926" expanded="true" signature="6332:6540" ph="..." /> | ||
1400 | - <marker date="1583590171926" expanded="false" signature="6333:6339" ph=" " /> | ||
1401 | - <marker date="1583590171926" expanded="false" signature="6339:6345" ph=" " /> | ||
1402 | - <marker date="1583590171926" expanded="false" signature="6345:6351" ph=" " /> | ||
1403 | - <marker date="1583590171926" expanded="false" signature="6351:6357" ph=" " /> | ||
1404 | - <marker date="1583590171926" expanded="false" signature="6381:6387" ph=" " /> | ||
1405 | - <marker date="1583590171926" expanded="false" signature="6390:6396" ph=" " /> | ||
1406 | - <marker date="1583590171926" expanded="false" signature="6398:6404" ph=" " /> | ||
1407 | - <marker date="1583590171926" expanded="false" signature="6455:6464" ph="..." /> | ||
1408 | - <marker date="1583590171926" expanded="false" signature="6494:6503" ph="..." /> | ||
1409 | - <marker date="1583590171926" expanded="false" signature="6581:6628" ph="..." /> | ||
1410 | - <marker date="1583590171926" expanded="false" signature="6630:6636" ph=" " /> | ||
1411 | - <marker date="1583590171926" expanded="false" signature="6636:6642" ph=" " /> | ||
1412 | - <marker date="1583590171926" expanded="false" signature="6642:6648" ph=" " /> | ||
1413 | - <marker date="1583590171926" expanded="false" signature="6648:6654" ph=" " /> | ||
1414 | - <marker date="1583590171926" expanded="false" signature="6709:6718" ph="..." /> | ||
1415 | - <marker date="1583590171926" expanded="false" signature="6837:6884" ph="..." /> | ||
1416 | - <marker date="1583590171926" expanded="false" signature="6886:6892" ph=" " /> | ||
1417 | - <marker date="1583590171926" expanded="false" signature="6892:6898" ph=" " /> | ||
1418 | - <marker date="1583590171926" expanded="false" signature="6898:6904" ph=" " /> | ||
1419 | - <marker date="1583590171926" expanded="false" signature="6904:6910" ph=" " /> | ||
1420 | - <marker date="1583590171926" expanded="false" signature="6964:6973" ph="..." /> | ||
1421 | - <marker date="1583590171926" expanded="false" signature="7047:7063" ph="..." /> | ||
1422 | - <marker date="1583590171926" expanded="false" signature="7115:7162" ph="..." /> | ||
1423 | - <marker date="1583590171926" expanded="false" signature="7164:7170" ph=" " /> | ||
1424 | - <marker date="1583590171926" expanded="false" signature="7170:7176" ph=" " /> | ||
1425 | - <marker date="1583590171926" expanded="false" signature="7176:7182" ph=" " /> | ||
1426 | - <marker date="1583590171926" expanded="false" signature="7182:7188" ph=" " /> | ||
1427 | - <marker date="1583590171926" expanded="false" signature="7215:7241" ph="..." /> | ||
1428 | - <marker date="1583590171926" expanded="false" signature="7319:7337" ph="..." /> | ||
1429 | - <marker date="1583590171926" expanded="true" signature="7338:7936" ph="..." /> | ||
1430 | - <marker date="1583590171926" expanded="false" signature="7366:7432" ph="..." /> | ||
1431 | - <marker date="1583590171926" expanded="false" signature="7471:7518" ph="..." /> | ||
1432 | - <marker date="1583590171926" expanded="false" signature="7520:7526" ph=" " /> | ||
1433 | - <marker date="1583590171926" expanded="false" signature="7526:7532" ph=" " /> | ||
1434 | - <marker date="1583590171926" expanded="false" signature="7532:7538" ph=" " /> | ||
1435 | - <marker date="1583590171926" expanded="false" signature="7538:7544" ph=" " /> | ||
1436 | - <marker date="1583590171926" expanded="false" signature="7629:7676" ph="..." /> | ||
1437 | - <marker date="1583590171926" expanded="false" signature="7678:7684" ph=" " /> | ||
1438 | - <marker date="1583590171926" expanded="false" signature="7684:7690" ph=" " /> | ||
1439 | - <marker date="1583590171926" expanded="false" signature="7690:7696" ph=" " /> | ||
1440 | - <marker date="1583590171926" expanded="false" signature="7696:7702" ph=" " /> | ||
1441 | - <marker date="1583590171926" expanded="false" signature="7803:7850" ph="..." /> | ||
1442 | - <marker date="1583590171926" expanded="false" signature="7852:7858" ph=" " /> | ||
1443 | - <marker date="1583590171926" expanded="false" signature="7858:7864" ph=" " /> | ||
1444 | - <marker date="1583590171926" expanded="false" signature="7864:7870" ph=" " /> | ||
1445 | - <marker date="1583590171926" expanded="false" signature="7870:7876" ph=" " /> | ||
1446 | - <marker date="1583590171926" expanded="false" signature="7960:7978" ph="..." /> | ||
1447 | - <marker date="1583590171926" expanded="true" signature="7979:9624" ph="..." /> | ||
1448 | - <marker date="1583590171926" expanded="false" signature="8007:8073" ph="..." /> | ||
1449 | - <marker date="1583590171926" expanded="false" signature="8112:8159" ph="..." /> | ||
1450 | - <marker date="1583590171926" expanded="false" signature="8161:8167" ph=" " /> | ||
1451 | - <marker date="1583590171926" expanded="false" signature="8167:8173" ph=" " /> | ||
1452 | - <marker date="1583590171926" expanded="false" signature="8173:8179" ph=" " /> | ||
1453 | - <marker date="1583590171926" expanded="false" signature="8179:8185" ph=" " /> | ||
1454 | - <marker date="1583590171926" expanded="false" signature="8309:8356" ph="..." /> | ||
1455 | - <marker date="1583590171926" expanded="false" signature="8358:8364" ph=" " /> | ||
1456 | - <marker date="1583590171926" expanded="false" signature="8364:8370" ph=" " /> | ||
1457 | - <marker date="1583590171926" expanded="false" signature="8370:8376" ph=" " /> | ||
1458 | - <marker date="1583590171926" expanded="false" signature="8376:8382" ph=" " /> | ||
1459 | - <marker date="1583590171926" expanded="false" signature="8534:8581" ph="..." /> | ||
1460 | - <marker date="1583590171926" expanded="false" signature="8583:8589" ph=" " /> | ||
1461 | - <marker date="1583590171926" expanded="false" signature="8589:8595" ph=" " /> | ||
1462 | - <marker date="1583590171926" expanded="false" signature="8595:8601" ph=" " /> | ||
1463 | - <marker date="1583590171926" expanded="false" signature="8601:8607" ph=" " /> | ||
1464 | - <marker date="1583590171926" expanded="false" signature="8726:8773" ph="..." /> | ||
1465 | - <marker date="1583590171926" expanded="false" signature="8775:8781" ph=" " /> | ||
1466 | - <marker date="1583590171926" expanded="false" signature="8781:8787" ph=" " /> | ||
1467 | - <marker date="1583590171926" expanded="false" signature="8787:8793" ph=" " /> | ||
1468 | - <marker date="1583590171926" expanded="false" signature="8793:8799" ph=" " /> | ||
1469 | - <marker date="1583590171926" expanded="false" signature="8883:8930" ph="..." /> | ||
1470 | - <marker date="1583590171926" expanded="false" signature="8932:8938" ph=" " /> | ||
1471 | - <marker date="1583590171926" expanded="false" signature="8938:8944" ph=" " /> | ||
1472 | - <marker date="1583590171926" expanded="false" signature="8944:8950" ph=" " /> | ||
1473 | - <marker date="1583590171926" expanded="false" signature="8950:8956" ph=" " /> | ||
1474 | - <marker date="1583590171926" expanded="false" signature="9016:9063" ph="..." /> | ||
1475 | - <marker date="1583590171926" expanded="false" signature="9065:9071" ph=" " /> | ||
1476 | - <marker date="1583590171926" expanded="false" signature="9071:9077" ph=" " /> | ||
1477 | - <marker date="1583590171926" expanded="false" signature="9077:9083" ph=" " /> | ||
1478 | - <marker date="1583590171926" expanded="false" signature="9083:9089" ph=" " /> | ||
1479 | - <marker date="1583590171926" expanded="false" signature="9273:9320" ph="..." /> | ||
1480 | - <marker date="1583590171926" expanded="false" signature="9322:9328" ph=" " /> | ||
1481 | - <marker date="1583590171926" expanded="false" signature="9328:9334" ph=" " /> | ||
1482 | - <marker date="1583590171926" expanded="false" signature="9334:9340" ph=" " /> | ||
1483 | - <marker date="1583590171926" expanded="false" signature="9340:9346" ph=" " /> | ||
1484 | - <marker date="1583590171926" expanded="false" signature="9474:9521" ph="..." /> | ||
1485 | - <marker date="1583590171926" expanded="false" signature="9523:9529" ph=" " /> | ||
1486 | - <marker date="1583590171926" expanded="false" signature="9529:9535" ph=" " /> | ||
1487 | - <marker date="1583590171926" expanded="false" signature="9535:9541" ph=" " /> | ||
1488 | - <marker date="1583590171926" expanded="false" signature="9541:9547" ph=" " /> | ||
1489 | - <marker date="1583590171926" expanded="false" signature="9648:9666" ph="..." /> | ||
1490 | - <marker date="1583590171926" expanded="true" signature="9667:10167" ph="..." /> | ||
1491 | - <marker date="1583590171926" expanded="false" signature="9695:9761" ph="..." /> | ||
1492 | - <marker date="1583590171926" expanded="false" signature="9802:9849" ph="..." /> | ||
1493 | - <marker date="1583590171926" expanded="false" signature="9851:9857" ph=" " /> | ||
1494 | - <marker date="1583590171926" expanded="false" signature="9857:9863" ph=" " /> | ||
1495 | - <marker date="1583590171926" expanded="false" signature="9863:9869" ph=" " /> | ||
1496 | - <marker date="1583590171926" expanded="false" signature="9869:9875" ph=" " /> | ||
1497 | - <marker date="1583590171926" expanded="false" signature="9987:10034" ph="..." /> | ||
1498 | - <marker date="1583590171926" expanded="false" signature="10036:10042" ph=" " /> | ||
1499 | - <marker date="1583590171926" expanded="false" signature="10042:10048" ph=" " /> | ||
1500 | - <marker date="1583590171926" expanded="false" signature="10048:10054" ph=" " /> | ||
1501 | - <marker date="1583590171926" expanded="false" signature="10054:10060" ph=" " /> | ||
1502 | - <marker date="1583590171926" expanded="false" signature="10191:10209" ph="..." /> | ||
1503 | - <marker date="1583590171926" expanded="true" signature="10210:11210" ph="..." /> | ||
1504 | - <marker date="1583590171926" expanded="false" signature="10238:10304" ph="..." /> | ||
1505 | - <marker date="1583590171926" expanded="false" signature="10343:10390" ph="..." /> | ||
1506 | - <marker date="1583590171926" expanded="false" signature="10392:10398" ph=" " /> | ||
1507 | - <marker date="1583590171926" expanded="false" signature="10398:10404" ph=" " /> | ||
1508 | - <marker date="1583590171926" expanded="false" signature="10404:10410" ph=" " /> | ||
1509 | - <marker date="1583590171926" expanded="false" signature="10410:10416" ph=" " /> | ||
1510 | - <marker date="1583590171926" expanded="false" signature="10482:10529" ph="..." /> | ||
1511 | - <marker date="1583590171926" expanded="false" signature="10531:10537" ph=" " /> | ||
1512 | - <marker date="1583590171926" expanded="false" signature="10537:10543" ph=" " /> | ||
1513 | - <marker date="1583590171926" expanded="false" signature="10543:10549" ph=" " /> | ||
1514 | - <marker date="1583590171926" expanded="false" signature="10549:10555" ph=" " /> | ||
1515 | - <marker date="1583590171926" expanded="false" signature="10612:10659" ph="..." /> | ||
1516 | - <marker date="1583590171926" expanded="false" signature="10661:10667" ph=" " /> | ||
1517 | - <marker date="1583590171926" expanded="false" signature="10667:10673" ph=" " /> | ||
1518 | - <marker date="1583590171926" expanded="false" signature="10673:10679" ph=" " /> | ||
1519 | - <marker date="1583590171926" expanded="false" signature="10679:10685" ph=" " /> | ||
1520 | - <marker date="1583590171926" expanded="false" signature="10763:10810" ph="..." /> | ||
1521 | - <marker date="1583590171926" expanded="false" signature="10812:10818" ph=" " /> | ||
1522 | - <marker date="1583590171926" expanded="false" signature="10818:10824" ph=" " /> | ||
1523 | - <marker date="1583590171926" expanded="false" signature="10824:10830" ph=" " /> | ||
1524 | - <marker date="1583590171926" expanded="false" signature="10830:10836" ph=" " /> | ||
1525 | - <marker date="1583590171926" expanded="false" signature="10929:10976" ph="..." /> | ||
1526 | - <marker date="1583590171926" expanded="false" signature="10978:10984" ph=" " /> | ||
1527 | - <marker date="1583590171926" expanded="false" signature="10984:10990" ph=" " /> | ||
1528 | - <marker date="1583590171926" expanded="false" signature="10990:10996" ph=" " /> | ||
1529 | - <marker date="1583590171926" expanded="false" signature="10996:11002" ph=" " /> | ||
1530 | - <marker date="1583590171926" expanded="false" signature="11076:11123" ph="..." /> | ||
1531 | - <marker date="1583590171926" expanded="false" signature="11125:11131" ph=" " /> | ||
1532 | - <marker date="1583590171926" expanded="false" signature="11131:11137" ph=" " /> | ||
1533 | - <marker date="1583590171926" expanded="false" signature="11137:11143" ph=" " /> | ||
1534 | - <marker date="1583590171926" expanded="false" signature="11143:11149" ph=" " /> | ||
1535 | - <marker date="1583590171926" expanded="false" signature="11234:11314" ph="..." /> | ||
1536 | - <marker date="1583590171926" expanded="false" signature="11375:11455" ph="..." /> | 1231 | + <element signature="e#40#74#0#PHP" expanded="true" /> |
1537 | </folding> | 1232 | </folding> |
1538 | </state> | 1233 | </state> |
1539 | </provider> | 1234 | </provider> |
1540 | </entry> | 1235 | </entry> |
1541 | - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js"> | 1236 | + <entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html"> |
1542 | <provider selected="true" editor-type-id="text-editor"> | 1237 | <provider selected="true" editor-type-id="text-editor"> |
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" /> | 1238 | + <state relative-caret-position="100"> |
1239 | + <caret line="4" column="51" lean-forward="true" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" /> | ||
1545 | <folding /> | 1240 | <folding /> |
1546 | </state> | 1241 | </state> |
1547 | </provider> | 1242 | </provider> |
1548 | </entry> | 1243 | </entry> |
1549 | - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js"> | 1244 | + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js"> |
1550 | <provider selected="true" editor-type-id="text-editor"> | 1245 | <provider selected="true" editor-type-id="text-editor"> |
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" /> | 1246 | + <state relative-caret-position="125"> |
1247 | + <caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="41" /> | ||
1553 | <folding /> | 1248 | <folding /> |
1554 | </state> | 1249 | </state> |
1555 | </provider> | 1250 | </provider> |
1556 | </entry> | 1251 | </entry> |
1557 | - <entry file="file://$PROJECT_DIR$/application/admin/controller/OrderDetail.php"> | 1252 | + <entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html"> |
1558 | <provider selected="true" editor-type-id="text-editor"> | 1253 | <provider selected="true" editor-type-id="text-editor"> |
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> | 1254 | + <state relative-caret-position="575"> |
1255 | + <caret line="23" column="24" lean-forward="true" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" /> | ||
1256 | + <folding /> | ||
1257 | + </state> | ||
1258 | + </provider> | ||
1259 | + </entry> | ||
1260 | + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js"> | ||
1261 | + <provider selected="true" editor-type-id="text-editor"> | ||
1262 | + <state relative-caret-position="300"> | ||
1263 | + <caret line="24" column="21" lean-forward="true" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" /> | ||
1264 | + <folding /> | ||
1564 | </state> | 1265 | </state> |
1565 | </provider> | 1266 | </provider> |
1566 | </entry> | 1267 | </entry> |
@@ -1572,13 +1273,225 @@ | @@ -1572,13 +1273,225 @@ | ||
1572 | </state> | 1273 | </state> |
1573 | </provider> | 1274 | </provider> |
1574 | </entry> | 1275 | </entry> |
1575 | - <entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html"> | 1276 | + <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/zip/zip.php"> |
1576 | <provider selected="true" editor-type-id="text-editor"> | 1277 | <provider selected="true" editor-type-id="text-editor"> |
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" /> | 1278 | + <state relative-caret-position="200"> |
1279 | + <caret line="8" column="6" lean-forward="false" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" /> | ||
1280 | + <folding /> | ||
1281 | + </state> | ||
1282 | + </provider> | ||
1283 | + </entry> | ||
1284 | + <entry file="file://$PROJECT_DIR$/application/config.php"> | ||
1285 | + <provider selected="true" editor-type-id="text-editor"> | ||
1286 | + <state relative-caret-position="300"> | ||
1287 | + <caret line="20" column="58" lean-forward="false" selection-start-line="20" selection-start-column="54" selection-end-line="20" selection-end-column="58" /> | ||
1579 | <folding /> | 1288 | <folding /> |
1580 | </state> | 1289 | </state> |
1581 | </provider> | 1290 | </provider> |
1582 | </entry> | 1291 | </entry> |
1292 | + <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php"> | ||
1293 | + <provider selected="true" editor-type-id="text-editor"> | ||
1294 | + <state relative-caret-position="459"> | ||
1295 | + <caret line="325" column="8" lean-forward="true" selection-start-line="325" selection-start-column="8" selection-end-line="325" selection-end-column="8" /> | ||
1296 | + <folding> | ||
1297 | + <element signature="e#928#2350#0#PHP" expanded="false" /> | ||
1298 | + <element signature="e#2356#11938#0#PHP" expanded="false" /> | ||
1299 | + <element signature="e#11971#14157#0#PHP" expanded="false" /> | ||
1300 | + <marker date="1590231116553" expanded="true" signature="3701:11482" ph="..." /> | ||
1301 | + <marker date="1590231116553" expanded="true" signature="3719:3854" ph="..." /> | ||
1302 | + <marker date="1590231116553" expanded="false" signature="3739:3805" ph="..." /> | ||
1303 | + <marker date="1590231116553" expanded="false" signature="3878:3925" ph="..." /> | ||
1304 | + <marker date="1590231116553" expanded="true" signature="3926:3964" ph="..." /> | ||
1305 | + <marker date="1590231116553" expanded="false" signature="3988:4015" ph="..." /> | ||
1306 | + <marker date="1590231116553" expanded="true" signature="4016:4171" ph="..." /> | ||
1307 | + <marker date="1590231116553" expanded="false" signature="4195:4211" ph="..." /> | ||
1308 | + <marker date="1590231116553" expanded="true" signature="4212:5259" ph="..." /> | ||
1309 | + <marker date="1590231116553" expanded="false" signature="4238:4282" ph="..." /> | ||
1310 | + <marker date="1590231116553" expanded="true" signature="4283:4361" ph="..." /> | ||
1311 | + <marker date="1590231116553" expanded="false" signature="4313:4325" ph="..." /> | ||
1312 | + <marker date="1590231116553" expanded="false" signature="4385:4429" ph="..." /> | ||
1313 | + <marker date="1590231116553" expanded="true" signature="4430:4508" ph="..." /> | ||
1314 | + <marker date="1590231116553" expanded="false" signature="4461:4473" ph="..." /> | ||
1315 | + <marker date="1590231116553" expanded="false" signature="4532:4576" ph="..." /> | ||
1316 | + <marker date="1590231116553" expanded="true" signature="4577:4655" ph="..." /> | ||
1317 | + <marker date="1590231116553" expanded="false" signature="4608:4620" ph="..." /> | ||
1318 | + <marker date="1590231116553" expanded="false" signature="4679:4723" ph="..." /> | ||
1319 | + <marker date="1590231116553" expanded="true" signature="4724:4805" ph="..." /> | ||
1320 | + <marker date="1590231116553" expanded="false" signature="4755:4767" ph="..." /> | ||
1321 | + <marker date="1590231116553" expanded="false" signature="4829:4873" ph="..." /> | ||
1322 | + <marker date="1590231116553" expanded="true" signature="4874:4959" ph="..." /> | ||
1323 | + <marker date="1590231116553" expanded="false" signature="4906:4918" ph="..." /> | ||
1324 | + <marker date="1590231116553" expanded="false" signature="4983:5027" ph="..." /> | ||
1325 | + <marker date="1590231116553" expanded="true" signature="5028:5110" ph="..." /> | ||
1326 | + <marker date="1590231116553" expanded="false" signature="5062:5074" ph="..." /> | ||
1327 | + <marker date="1590231116553" expanded="false" signature="5134:5178" ph="..." /> | ||
1328 | + <marker date="1590231116553" expanded="true" signature="5179:5242" ph="..." /> | ||
1329 | + <marker date="1590231116553" expanded="true" signature="5284:5748" ph="..." /> | ||
1330 | + <marker date="1590231116553" expanded="false" signature="5312:5378" ph="..." /> | ||
1331 | + <marker date="1590231116553" expanded="false" signature="5421:5466" ph="..." /> | ||
1332 | + <marker date="1590231116553" expanded="true" signature="5467:5731" ph="..." /> | ||
1333 | + <marker date="1590231116553" expanded="false" signature="5468:5474" ph=" " /> | ||
1334 | + <marker date="1590231116553" expanded="false" signature="5474:5480" ph=" " /> | ||
1335 | + <marker date="1590231116553" expanded="false" signature="5480:5486" ph=" " /> | ||
1336 | + <marker date="1590231116553" expanded="false" signature="5486:5492" ph=" " /> | ||
1337 | + <marker date="1590231116553" expanded="false" signature="5524:5533" ph="..." /> | ||
1338 | + <marker date="1590231116553" expanded="false" signature="5576:5585" ph="..." /> | ||
1339 | + <marker date="1590231116553" expanded="false" signature="5614:5623" ph="..." /> | ||
1340 | + <marker date="1590231116553" expanded="false" signature="5648:5657" ph="..." /> | ||
1341 | + <marker date="1590231116553" expanded="false" signature="5772:5790" ph="..." /> | ||
1342 | + <marker date="1590231116553" expanded="true" signature="5791:6108" ph="..." /> | ||
1343 | + <marker date="1590231116553" expanded="false" signature="5819:5885" ph="..." /> | ||
1344 | + <marker date="1590231116553" expanded="false" signature="5924:5952" ph="..." /> | ||
1345 | + <marker date="1590231116553" expanded="false" signature="5954:5960" ph=" " /> | ||
1346 | + <marker date="1590231116553" expanded="false" signature="5960:5966" ph=" " /> | ||
1347 | + <marker date="1590231116553" expanded="false" signature="5966:5972" ph=" " /> | ||
1348 | + <marker date="1590231116553" expanded="false" signature="5972:5978" ph=" " /> | ||
1349 | + <marker date="1590231116553" expanded="false" signature="6031:6040" ph="..." /> | ||
1350 | + <marker date="1590231116553" expanded="false" signature="6132:6150" ph="..." /> | ||
1351 | + <marker date="1590231116553" expanded="true" signature="6151:6557" ph="..." /> | ||
1352 | + <marker date="1590231116553" expanded="false" signature="6179:6245" ph="..." /> | ||
1353 | + <marker date="1590231116553" expanded="false" signature="6286:6331" ph="..." /> | ||
1354 | + <marker date="1590231116553" expanded="true" signature="6332:6540" ph="..." /> | ||
1355 | + <marker date="1590231116553" expanded="false" signature="6333:6339" ph=" " /> | ||
1356 | + <marker date="1590231116553" expanded="false" signature="6339:6345" ph=" " /> | ||
1357 | + <marker date="1590231116553" expanded="false" signature="6345:6351" ph=" " /> | ||
1358 | + <marker date="1590231116553" expanded="false" signature="6351:6357" ph=" " /> | ||
1359 | + <marker date="1590231116553" expanded="false" signature="6381:6387" ph=" " /> | ||
1360 | + <marker date="1590231116553" expanded="false" signature="6390:6396" ph=" " /> | ||
1361 | + <marker date="1590231116553" expanded="false" signature="6398:6404" ph=" " /> | ||
1362 | + <marker date="1590231116553" expanded="false" signature="6455:6464" ph="..." /> | ||
1363 | + <marker date="1590231116553" expanded="false" signature="6494:6503" ph="..." /> | ||
1364 | + <marker date="1590231116553" expanded="false" signature="6581:6628" ph="..." /> | ||
1365 | + <marker date="1590231116553" expanded="false" signature="6630:6636" ph=" " /> | ||
1366 | + <marker date="1590231116553" expanded="false" signature="6636:6642" ph=" " /> | ||
1367 | + <marker date="1590231116553" expanded="false" signature="6642:6648" ph=" " /> | ||
1368 | + <marker date="1590231116553" expanded="false" signature="6648:6654" ph=" " /> | ||
1369 | + <marker date="1590231116553" expanded="false" signature="6709:6718" ph="..." /> | ||
1370 | + <marker date="1590231116553" expanded="false" signature="6837:6884" ph="..." /> | ||
1371 | + <marker date="1590231116553" expanded="false" signature="6886:6892" ph=" " /> | ||
1372 | + <marker date="1590231116553" expanded="false" signature="6892:6898" ph=" " /> | ||
1373 | + <marker date="1590231116553" expanded="false" signature="6898:6904" ph=" " /> | ||
1374 | + <marker date="1590231116553" expanded="false" signature="6904:6910" ph=" " /> | ||
1375 | + <marker date="1590231116553" expanded="false" signature="6964:6973" ph="..." /> | ||
1376 | + <marker date="1590231116553" expanded="false" signature="7047:7063" ph="..." /> | ||
1377 | + <marker date="1590231116553" expanded="false" signature="7115:7162" ph="..." /> | ||
1378 | + <marker date="1590231116553" expanded="false" signature="7164:7170" ph=" " /> | ||
1379 | + <marker date="1590231116553" expanded="false" signature="7170:7176" ph=" " /> | ||
1380 | + <marker date="1590231116553" expanded="false" signature="7176:7182" ph=" " /> | ||
1381 | + <marker date="1590231116553" expanded="false" signature="7182:7188" ph=" " /> | ||
1382 | + <marker date="1590231116553" expanded="false" signature="7215:7241" ph="..." /> | ||
1383 | + <marker date="1590231116553" expanded="false" signature="7319:7337" ph="..." /> | ||
1384 | + <marker date="1590231116553" expanded="true" signature="7338:7936" ph="..." /> | ||
1385 | + <marker date="1590231116553" expanded="false" signature="7366:7432" ph="..." /> | ||
1386 | + <marker date="1590231116553" expanded="false" signature="7471:7518" ph="..." /> | ||
1387 | + <marker date="1590231116553" expanded="false" signature="7520:7526" ph=" " /> | ||
1388 | + <marker date="1590231116553" expanded="false" signature="7526:7532" ph=" " /> | ||
1389 | + <marker date="1590231116553" expanded="false" signature="7532:7538" ph=" " /> | ||
1390 | + <marker date="1590231116553" expanded="false" signature="7538:7544" ph=" " /> | ||
1391 | + <marker date="1590231116553" expanded="false" signature="7629:7676" ph="..." /> | ||
1392 | + <marker date="1590231116553" expanded="false" signature="7678:7684" ph=" " /> | ||
1393 | + <marker date="1590231116553" expanded="false" signature="7684:7690" ph=" " /> | ||
1394 | + <marker date="1590231116553" expanded="false" signature="7690:7696" ph=" " /> | ||
1395 | + <marker date="1590231116553" expanded="false" signature="7696:7702" ph=" " /> | ||
1396 | + <marker date="1590231116553" expanded="false" signature="7803:7850" ph="..." /> | ||
1397 | + <marker date="1590231116553" expanded="false" signature="7852:7858" ph=" " /> | ||
1398 | + <marker date="1590231116553" expanded="false" signature="7858:7864" ph=" " /> | ||
1399 | + <marker date="1590231116553" expanded="false" signature="7864:7870" ph=" " /> | ||
1400 | + <marker date="1590231116553" expanded="false" signature="7870:7876" ph=" " /> | ||
1401 | + <marker date="1590231116553" expanded="false" signature="7960:7978" ph="..." /> | ||
1402 | + <marker date="1590231116553" expanded="true" signature="7979:9624" ph="..." /> | ||
1403 | + <marker date="1590231116553" expanded="false" signature="8007:8073" ph="..." /> | ||
1404 | + <marker date="1590231116553" expanded="false" signature="8112:8159" ph="..." /> | ||
1405 | + <marker date="1590231116553" expanded="false" signature="8161:8167" ph=" " /> | ||
1406 | + <marker date="1590231116553" expanded="false" signature="8167:8173" ph=" " /> | ||
1407 | + <marker date="1590231116553" expanded="false" signature="8173:8179" ph=" " /> | ||
1408 | + <marker date="1590231116553" expanded="false" signature="8179:8185" ph=" " /> | ||
1409 | + <marker date="1590231116553" expanded="false" signature="8309:8356" ph="..." /> | ||
1410 | + <marker date="1590231116553" expanded="false" signature="8358:8364" ph=" " /> | ||
1411 | + <marker date="1590231116553" expanded="false" signature="8364:8370" ph=" " /> | ||
1412 | + <marker date="1590231116553" expanded="false" signature="8370:8376" ph=" " /> | ||
1413 | + <marker date="1590231116553" expanded="false" signature="8376:8382" ph=" " /> | ||
1414 | + <marker date="1590231116553" expanded="false" signature="8534:8581" ph="..." /> | ||
1415 | + <marker date="1590231116553" expanded="false" signature="8583:8589" ph=" " /> | ||
1416 | + <marker date="1590231116553" expanded="false" signature="8589:8595" ph=" " /> | ||
1417 | + <marker date="1590231116553" expanded="false" signature="8595:8601" ph=" " /> | ||
1418 | + <marker date="1590231116553" expanded="false" signature="8601:8607" ph=" " /> | ||
1419 | + <marker date="1590231116553" expanded="false" signature="8726:8773" ph="..." /> | ||
1420 | + <marker date="1590231116553" expanded="false" signature="8775:8781" ph=" " /> | ||
1421 | + <marker date="1590231116553" expanded="false" signature="8781:8787" ph=" " /> | ||
1422 | + <marker date="1590231116553" expanded="false" signature="8787:8793" ph=" " /> | ||
1423 | + <marker date="1590231116553" expanded="false" signature="8793:8799" ph=" " /> | ||
1424 | + <marker date="1590231116553" expanded="false" signature="8883:8930" ph="..." /> | ||
1425 | + <marker date="1590231116553" expanded="false" signature="8932:8938" ph=" " /> | ||
1426 | + <marker date="1590231116553" expanded="false" signature="8938:8944" ph=" " /> | ||
1427 | + <marker date="1590231116553" expanded="false" signature="8944:8950" ph=" " /> | ||
1428 | + <marker date="1590231116553" expanded="false" signature="8950:8956" ph=" " /> | ||
1429 | + <marker date="1590231116553" expanded="false" signature="9016:9063" ph="..." /> | ||
1430 | + <marker date="1590231116553" expanded="false" signature="9065:9071" ph=" " /> | ||
1431 | + <marker date="1590231116553" expanded="false" signature="9071:9077" ph=" " /> | ||
1432 | + <marker date="1590231116553" expanded="false" signature="9077:9083" ph=" " /> | ||
1433 | + <marker date="1590231116553" expanded="false" signature="9083:9089" ph=" " /> | ||
1434 | + <marker date="1590231116553" expanded="false" signature="9273:9320" ph="..." /> | ||
1435 | + <marker date="1590231116553" expanded="false" signature="9322:9328" ph=" " /> | ||
1436 | + <marker date="1590231116553" expanded="false" signature="9328:9334" ph=" " /> | ||
1437 | + <marker date="1590231116553" expanded="false" signature="9334:9340" ph=" " /> | ||
1438 | + <marker date="1590231116553" expanded="false" signature="9340:9346" ph=" " /> | ||
1439 | + <marker date="1590231116553" expanded="false" signature="9474:9521" ph="..." /> | ||
1440 | + <marker date="1590231116553" expanded="false" signature="9523:9529" ph=" " /> | ||
1441 | + <marker date="1590231116553" expanded="false" signature="9529:9535" ph=" " /> | ||
1442 | + <marker date="1590231116553" expanded="false" signature="9535:9541" ph=" " /> | ||
1443 | + <marker date="1590231116553" expanded="false" signature="9541:9547" ph=" " /> | ||
1444 | + <marker date="1590231116553" expanded="false" signature="9648:9666" ph="..." /> | ||
1445 | + <marker date="1590231116553" expanded="true" signature="9667:10167" ph="..." /> | ||
1446 | + <marker date="1590231116553" expanded="false" signature="9695:9761" ph="..." /> | ||
1447 | + <marker date="1590231116553" expanded="false" signature="9802:9849" ph="..." /> | ||
1448 | + <marker date="1590231116553" expanded="false" signature="9851:9857" ph=" " /> | ||
1449 | + <marker date="1590231116553" expanded="false" signature="9857:9863" ph=" " /> | ||
1450 | + <marker date="1590231116553" expanded="false" signature="9863:9869" ph=" " /> | ||
1451 | + <marker date="1590231116553" expanded="false" signature="9869:9875" ph=" " /> | ||
1452 | + <marker date="1590231116553" expanded="false" signature="9987:10034" ph="..." /> | ||
1453 | + <marker date="1590231116553" expanded="false" signature="10036:10042" ph=" " /> | ||
1454 | + <marker date="1590231116553" expanded="false" signature="10042:10048" ph=" " /> | ||
1455 | + <marker date="1590231116553" expanded="false" signature="10048:10054" ph=" " /> | ||
1456 | + <marker date="1590231116553" expanded="false" signature="10054:10060" ph=" " /> | ||
1457 | + <marker date="1590231116553" expanded="false" signature="10191:10209" ph="..." /> | ||
1458 | + <marker date="1590231116553" expanded="true" signature="10210:11210" ph="..." /> | ||
1459 | + <marker date="1590231116553" expanded="false" signature="10238:10304" ph="..." /> | ||
1460 | + <marker date="1590231116553" expanded="false" signature="10343:10390" ph="..." /> | ||
1461 | + <marker date="1590231116553" expanded="false" signature="10392:10398" ph=" " /> | ||
1462 | + <marker date="1590231116553" expanded="false" signature="10398:10404" ph=" " /> | ||
1463 | + <marker date="1590231116553" expanded="false" signature="10404:10410" ph=" " /> | ||
1464 | + <marker date="1590231116553" expanded="false" signature="10410:10416" ph=" " /> | ||
1465 | + <marker date="1590231116553" expanded="false" signature="10482:10529" ph="..." /> | ||
1466 | + <marker date="1590231116553" expanded="false" signature="10531:10537" ph=" " /> | ||
1467 | + <marker date="1590231116553" expanded="false" signature="10537:10543" ph=" " /> | ||
1468 | + <marker date="1590231116553" expanded="false" signature="10543:10549" ph=" " /> | ||
1469 | + <marker date="1590231116553" expanded="false" signature="10549:10555" ph=" " /> | ||
1470 | + <marker date="1590231116553" expanded="false" signature="10612:10659" ph="..." /> | ||
1471 | + <marker date="1590231116553" expanded="false" signature="10661:10667" ph=" " /> | ||
1472 | + <marker date="1590231116553" expanded="false" signature="10667:10673" ph=" " /> | ||
1473 | + <marker date="1590231116553" expanded="false" signature="10673:10679" ph=" " /> | ||
1474 | + <marker date="1590231116553" expanded="false" signature="10679:10685" ph=" " /> | ||
1475 | + <marker date="1590231116553" expanded="false" signature="10763:10810" ph="..." /> | ||
1476 | + <marker date="1590231116553" expanded="false" signature="10812:10818" ph=" " /> | ||
1477 | + <marker date="1590231116553" expanded="false" signature="10818:10824" ph=" " /> | ||
1478 | + <marker date="1590231116553" expanded="false" signature="10824:10830" ph=" " /> | ||
1479 | + <marker date="1590231116553" expanded="false" signature="10830:10836" ph=" " /> | ||
1480 | + <marker date="1590231116553" expanded="false" signature="10929:10976" ph="..." /> | ||
1481 | + <marker date="1590231116553" expanded="false" signature="10978:10984" ph=" " /> | ||
1482 | + <marker date="1590231116553" expanded="false" signature="10984:10990" ph=" " /> | ||
1483 | + <marker date="1590231116553" expanded="false" signature="10990:10996" ph=" " /> | ||
1484 | + <marker date="1590231116553" expanded="false" signature="10996:11002" ph=" " /> | ||
1485 | + <marker date="1590231116553" expanded="false" signature="11076:11123" ph="..." /> | ||
1486 | + <marker date="1590231116553" expanded="false" signature="11125:11131" ph=" " /> | ||
1487 | + <marker date="1590231116553" expanded="false" signature="11131:11137" ph=" " /> | ||
1488 | + <marker date="1590231116553" expanded="false" signature="11137:11143" ph=" " /> | ||
1489 | + <marker date="1590231116553" expanded="false" signature="11143:11149" ph=" " /> | ||
1490 | + <marker date="1590231116553" expanded="false" signature="11234:11314" ph="..." /> | ||
1491 | + <marker date="1590231116553" expanded="false" signature="11375:11455" ph="..." /> | ||
1492 | + </folding> | ||
1493 | + </state> | ||
1494 | + </provider> | ||
1495 | + </entry> | ||
1583 | </component> | 1496 | </component> |
1584 | </project> | 1497 | </project> |
@@ -291,4 +291,48 @@ class Order extends Backend | @@ -291,4 +291,48 @@ class Order extends Backend | ||
291 | } | 291 | } |
292 | return $this->view->fetch(); | 292 | return $this->view->fetch(); |
293 | } | 293 | } |
294 | + | ||
295 | + | ||
296 | + /** | ||
297 | + * 导出发票信息 | ||
298 | + */ | ||
299 | + public function qrcode_zip() | ||
300 | + { | ||
301 | + $list = Db::name('invoice') | ||
302 | + ->select(); | ||
303 | + foreach ($list as &$val){ | ||
304 | + $val['user_id'] = Db::name('user')->where('id',$val['user_id'])->value('nickname'); | ||
305 | + if(!empty($val['order_id'])){ | ||
306 | + $order_id = explode(',',trim($val['order_id'],',')); | ||
307 | + $order_id = Db::name('order')->whereIn('id',$order_id)->column('num'); | ||
308 | + $val['order_id'] = implode(',',$order_id); | ||
309 | + } | ||
310 | + $val['createtime'] = date('Y-m-d H:i:s',$val['createtime']); | ||
311 | + } | ||
312 | + ob_end_clean();//清除缓冲区,避免乱码 | ||
313 | + header('Content-type:application/vnd.ms-excel'); | ||
314 | + header('Content-Disposition:attachment;filename='. '发票信息' .'.xls');//文件名自己取 | ||
315 | + $THead = array('id' ,'用户昵称' ,'订单号' ,'公司名称' ,'公司电话','公司地址','纳税人识别号','银行名称','银行账号','收件人名字','收件人电话','收件人地址','创建时间');//这里是要输出的列头 | ||
316 | + $TBody = $list; | ||
317 | + | ||
318 | + echo '<table>';//以表格的形式输出 也可以字符串拼接 | ||
319 | +//输出head | ||
320 | + echo '<tr>'; | ||
321 | + foreach ( $THead as $h ) | ||
322 | + { | ||
323 | + echo '<th>' . $h . '</th>';//直接输出即可, | ||
324 | + } | ||
325 | + echo '</tr>'; | ||
326 | +//输出body | ||
327 | + foreach ( $TBody as $row ) | ||
328 | + { | ||
329 | + echo '<tr>'; | ||
330 | + foreach ($row as $v) { | ||
331 | + echo '<td>' . $v . '</td>'; | ||
332 | + } | ||
333 | + echo '</tr>'; | ||
334 | + } | ||
335 | + echo '</table>';//OK | ||
336 | + exit(); | ||
337 | + } | ||
294 | } | 338 | } |
@@ -7,18 +7,19 @@ | @@ -7,18 +7,19 @@ | ||
7 | <div class="widget-body no-padding"> | 7 | <div class="widget-body no-padding"> |
8 | <div id="toolbar" class="toolbar"> | 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> | 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> | 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> | 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> | 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 | 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> | 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 | + <a href="{:url('qrcode_zip')}" class="btn btn-danger {:$auth->check('order/qrcode_zip')?'':'hide'}" title="{:__('导出')}"> {:__('导出')}</a> | ||
22 | 23 | ||
23 | 24 | ||
24 | </div> | 25 | </div> |
@@ -23,6 +23,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin | @@ -23,6 +23,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin | ||
23 | sortName: 'id', | 23 | sortName: 'id', |
24 | columns: [ | 24 | columns: [ |
25 | [ | 25 | [ |
26 | + {checkbox: true}, | ||
26 | {field: 'id', title: __('Id'), operate:false}, | 27 | {field: 'id', title: __('Id'), operate:false}, |
27 | {field: 'user.nickname', title: __('User.nickname')}, | 28 | {field: 'user.nickname', title: __('User.nickname')}, |
28 | {field: 'pic_id', title: __('Pic_id'), operate:false}, | 29 | {field: 'pic_id', title: __('Pic_id'), operate:false}, |
-
请 注册 或 登录 后发表评论