郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 396599da958b05e680e7d269afd74b1ec9deca88 1 个父辈 53270c1e
1 个管道 的构建 失败 耗费 0 秒

后台导出excel

内嵌 并排对比
正在显示 4 个修改的文件 包含 313 行增加 和 354 行删除
... ... @@ -5,15 +5,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/controller/OrderDetail.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/view/order_detail/index.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/assets/js/backend/order_detail.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/user/User.php" afterPath="$PROJECT_DIR$/application/admin/controller/user/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/model/User.php" afterPath="$PROJECT_DIR$/application/admin/model/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/user/user/index.html" afterPath="$PROJECT_DIR$/application/admin/view/user/user/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/user/user.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/user/user.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/order/index.html" afterPath="$PROJECT_DIR$/application/admin/view/order/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/order.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/order.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -23,28 +18,7 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="order_detail.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order_detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="28" column="78" lean-forward="true" selection-start-line="28" selection-start-column="78" selection-end-line="28" selection-end-column="78" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="51" lean-forward="true" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
... ... @@ -88,8 +62,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/assets/js/backend/cover.js" />
<option value="$PROJECT_DIR$/application/admin/view/words/index.html" />
<option value="$PROJECT_DIR$/application/admin/model/Video.php" />
<option value="$PROJECT_DIR$/application/admin/view/addword/index.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Addword.php" />
... ... @@ -109,7 +81,6 @@
<option value="$PROJECT_DIR$/application/admin/view/share/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/share/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/share.js" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/common/controller/Api.php" />
<option value="$PROJECT_DIR$/application/common/library/Token.php" />
<option value="$PROJECT_DIR$/application/common/library/Auth.php" />
... ... @@ -126,7 +97,6 @@
<option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<option value="$PROJECT_DIR$/application/admin/library/Auth.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Index.php" />
<option value="$PROJECT_DIR$/application/config.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/model/User.php" />
... ... @@ -139,6 +109,10 @@
<option value="$PROJECT_DIR$/application/admin/controller/OrderDetail.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order_detail.js" />
<option value="$PROJECT_DIR$/application/admin/view/order_detail/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
<option value="$PROJECT_DIR$/application/admin/view/order/index.html" />
<option value="$PROJECT_DIR$/application/config.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
</list>
</option>
</component>
... ... @@ -156,11 +130,10 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="95" />
<option name="y" value="39" />
<option name="width" value="1783" />
<option name="height" value="953" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="149" />
<option name="width" value="1747" />
<option name="height" value="1010" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -189,69 +162,6 @@
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="order_detail" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -262,7 +172,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../fastadmin/questions" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../fastadmin/room" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="settings.editor.selected.configurable" value="preferences.keymap" />
</component>
... ... @@ -426,7 +336,7 @@
<workItem from="1590137451444" duration="1533000" />
<workItem from="1590141410628" duration="1864000" />
<workItem from="1590193431145" duration="1982000" />
<workItem from="1590217205221" duration="7795000" />
<workItem from="1590217205221" duration="12032000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -649,7 +559,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="688759000" />
<option name="totallyTimeSpent" value="692996000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -661,10 +571,9 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<frame x="149" y="0" width="1747" height="1010" extended-state="1" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13326226" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<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" />
<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" />
<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" />
<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 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/common/library/token/Driver.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269">
<caret line="35" column="22" lean-forward="false" selection-start-line="35" selection-start-column="22" selection-end-line="35" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/library/Token.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1462">
... ... @@ -917,14 +819,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="228" column="22" lean-forward="true" selection-start-line="228" selection-start-column="22" selection-end-line="228" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
... ... @@ -1194,14 +1088,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="31" column="98" lean-forward="false" selection-start-line="31" selection-start-column="65" selection-end-line="31" selection-end-column="98" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-118">
... ... @@ -1329,238 +1215,53 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="21" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<state relative-caret-position="375">
<caret line="51" column="54" lean-forward="false" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<entry file="file://$PROJECT_DIR$/application/admin/controller/OrderDetail.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="59" column="36" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="294" selection-end-column="0" />
<state relative-caret-position="-50">
<caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
<folding>
<marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." />
<marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." />
<marker date="1583590171926" expanded="false" signature="3739:3805" ph="..." />
<marker date="1583590171926" expanded="false" signature="3878:3925" ph="..." />
<marker date="1583590171926" expanded="true" signature="3926:3964" ph="..." />
<marker date="1583590171926" expanded="false" signature="3988:4015" ph="..." />
<marker date="1583590171926" expanded="true" signature="4016:4171" ph="..." />
<marker date="1583590171926" expanded="false" signature="4195:4211" ph="..." />
<marker date="1583590171926" expanded="true" signature="4212:5259" ph="..." />
<marker date="1583590171926" expanded="false" signature="4238:4282" ph="..." />
<marker date="1583590171926" expanded="true" signature="4283:4361" ph="..." />
<marker date="1583590171926" expanded="false" signature="4313:4325" ph="..." />
<marker date="1583590171926" expanded="false" signature="4385:4429" ph="..." />
<marker date="1583590171926" expanded="true" signature="4430:4508" ph="..." />
<marker date="1583590171926" expanded="false" signature="4461:4473" ph="..." />
<marker date="1583590171926" expanded="false" signature="4532:4576" ph="..." />
<marker date="1583590171926" expanded="true" signature="4577:4655" ph="..." />
<marker date="1583590171926" expanded="false" signature="4608:4620" ph="..." />
<marker date="1583590171926" expanded="false" signature="4679:4723" ph="..." />
<marker date="1583590171926" expanded="true" signature="4724:4805" ph="..." />
<marker date="1583590171926" expanded="false" signature="4755:4767" ph="..." />
<marker date="1583590171926" expanded="false" signature="4829:4873" ph="..." />
<marker date="1583590171926" expanded="true" signature="4874:4959" ph="..." />
<marker date="1583590171926" expanded="false" signature="4906:4918" ph="..." />
<marker date="1583590171926" expanded="false" signature="4983:5027" ph="..." />
<marker date="1583590171926" expanded="true" signature="5028:5110" ph="..." />
<marker date="1583590171926" expanded="false" signature="5062:5074" ph="..." />
<marker date="1583590171926" expanded="false" signature="5134:5178" ph="..." />
<marker date="1583590171926" expanded="true" signature="5179:5242" ph="..." />
<marker date="1583590171926" expanded="true" signature="5284:5748" ph="..." />
<marker date="1583590171926" expanded="false" signature="5312:5378" ph="..." />
<marker date="1583590171926" expanded="false" signature="5421:5466" ph="..." />
<marker date="1583590171926" expanded="true" signature="5467:5731" ph="..." />
<marker date="1583590171926" expanded="false" signature="5468:5474" ph=" " />
<marker date="1583590171926" expanded="false" signature="5474:5480" ph=" " />
<marker date="1583590171926" expanded="false" signature="5480:5486" ph=" " />
<marker date="1583590171926" expanded="false" signature="5486:5492" ph=" " />
<marker date="1583590171926" expanded="false" signature="5524:5533" ph="..." />
<marker date="1583590171926" expanded="false" signature="5576:5585" ph="..." />
<marker date="1583590171926" expanded="false" signature="5614:5623" ph="..." />
<marker date="1583590171926" expanded="false" signature="5648:5657" ph="..." />
<marker date="1583590171926" expanded="false" signature="5772:5790" ph="..." />
<marker date="1583590171926" expanded="true" signature="5791:6108" ph="..." />
<marker date="1583590171926" expanded="false" signature="5819:5885" ph="..." />
<marker date="1583590171926" expanded="false" signature="5924:5952" ph="..." />
<marker date="1583590171926" expanded="false" signature="5954:5960" ph=" " />
<marker date="1583590171926" expanded="false" signature="5960:5966" ph=" " />
<marker date="1583590171926" expanded="false" signature="5966:5972" ph=" " />
<marker date="1583590171926" expanded="false" signature="5972:5978" ph=" " />
<marker date="1583590171926" expanded="false" signature="6031:6040" ph="..." />
<marker date="1583590171926" expanded="false" signature="6132:6150" ph="..." />
<marker date="1583590171926" expanded="true" signature="6151:6557" ph="..." />
<marker date="1583590171926" expanded="false" signature="6179:6245" ph="..." />
<marker date="1583590171926" expanded="false" signature="6286:6331" ph="..." />
<marker date="1583590171926" expanded="true" signature="6332:6540" ph="..." />
<marker date="1583590171926" expanded="false" signature="6333:6339" ph=" " />
<marker date="1583590171926" expanded="false" signature="6339:6345" ph=" " />
<marker date="1583590171926" expanded="false" signature="6345:6351" ph=" " />
<marker date="1583590171926" expanded="false" signature="6351:6357" ph=" " />
<marker date="1583590171926" expanded="false" signature="6381:6387" ph=" " />
<marker date="1583590171926" expanded="false" signature="6390:6396" ph=" " />
<marker date="1583590171926" expanded="false" signature="6398:6404" ph=" " />
<marker date="1583590171926" expanded="false" signature="6455:6464" ph="..." />
<marker date="1583590171926" expanded="false" signature="6494:6503" ph="..." />
<marker date="1583590171926" expanded="false" signature="6581:6628" ph="..." />
<marker date="1583590171926" expanded="false" signature="6630:6636" ph=" " />
<marker date="1583590171926" expanded="false" signature="6636:6642" ph=" " />
<marker date="1583590171926" expanded="false" signature="6642:6648" ph=" " />
<marker date="1583590171926" expanded="false" signature="6648:6654" ph=" " />
<marker date="1583590171926" expanded="false" signature="6709:6718" ph="..." />
<marker date="1583590171926" expanded="false" signature="6837:6884" ph="..." />
<marker date="1583590171926" expanded="false" signature="6886:6892" ph=" " />
<marker date="1583590171926" expanded="false" signature="6892:6898" ph=" " />
<marker date="1583590171926" expanded="false" signature="6898:6904" ph=" " />
<marker date="1583590171926" expanded="false" signature="6904:6910" ph=" " />
<marker date="1583590171926" expanded="false" signature="6964:6973" ph="..." />
<marker date="1583590171926" expanded="false" signature="7047:7063" ph="..." />
<marker date="1583590171926" expanded="false" signature="7115:7162" ph="..." />
<marker date="1583590171926" expanded="false" signature="7164:7170" ph=" " />
<marker date="1583590171926" expanded="false" signature="7170:7176" ph=" " />
<marker date="1583590171926" expanded="false" signature="7176:7182" ph=" " />
<marker date="1583590171926" expanded="false" signature="7182:7188" ph=" " />
<marker date="1583590171926" expanded="false" signature="7215:7241" ph="..." />
<marker date="1583590171926" expanded="false" signature="7319:7337" ph="..." />
<marker date="1583590171926" expanded="true" signature="7338:7936" ph="..." />
<marker date="1583590171926" expanded="false" signature="7366:7432" ph="..." />
<marker date="1583590171926" expanded="false" signature="7471:7518" ph="..." />
<marker date="1583590171926" expanded="false" signature="7520:7526" ph=" " />
<marker date="1583590171926" expanded="false" signature="7526:7532" ph=" " />
<marker date="1583590171926" expanded="false" signature="7532:7538" ph=" " />
<marker date="1583590171926" expanded="false" signature="7538:7544" ph=" " />
<marker date="1583590171926" expanded="false" signature="7629:7676" ph="..." />
<marker date="1583590171926" expanded="false" signature="7678:7684" ph=" " />
<marker date="1583590171926" expanded="false" signature="7684:7690" ph=" " />
<marker date="1583590171926" expanded="false" signature="7690:7696" ph=" " />
<marker date="1583590171926" expanded="false" signature="7696:7702" ph=" " />
<marker date="1583590171926" expanded="false" signature="7803:7850" ph="..." />
<marker date="1583590171926" expanded="false" signature="7852:7858" ph=" " />
<marker date="1583590171926" expanded="false" signature="7858:7864" ph=" " />
<marker date="1583590171926" expanded="false" signature="7864:7870" ph=" " />
<marker date="1583590171926" expanded="false" signature="7870:7876" ph=" " />
<marker date="1583590171926" expanded="false" signature="7960:7978" ph="..." />
<marker date="1583590171926" expanded="true" signature="7979:9624" ph="..." />
<marker date="1583590171926" expanded="false" signature="8007:8073" ph="..." />
<marker date="1583590171926" expanded="false" signature="8112:8159" ph="..." />
<marker date="1583590171926" expanded="false" signature="8161:8167" ph=" " />
<marker date="1583590171926" expanded="false" signature="8167:8173" ph=" " />
<marker date="1583590171926" expanded="false" signature="8173:8179" ph=" " />
<marker date="1583590171926" expanded="false" signature="8179:8185" ph=" " />
<marker date="1583590171926" expanded="false" signature="8309:8356" ph="..." />
<marker date="1583590171926" expanded="false" signature="8358:8364" ph=" " />
<marker date="1583590171926" expanded="false" signature="8364:8370" ph=" " />
<marker date="1583590171926" expanded="false" signature="8370:8376" ph=" " />
<marker date="1583590171926" expanded="false" signature="8376:8382" ph=" " />
<marker date="1583590171926" expanded="false" signature="8534:8581" ph="..." />
<marker date="1583590171926" expanded="false" signature="8583:8589" ph=" " />
<marker date="1583590171926" expanded="false" signature="8589:8595" ph=" " />
<marker date="1583590171926" expanded="false" signature="8595:8601" ph=" " />
<marker date="1583590171926" expanded="false" signature="8601:8607" ph=" " />
<marker date="1583590171926" expanded="false" signature="8726:8773" ph="..." />
<marker date="1583590171926" expanded="false" signature="8775:8781" ph=" " />
<marker date="1583590171926" expanded="false" signature="8781:8787" ph=" " />
<marker date="1583590171926" expanded="false" signature="8787:8793" ph=" " />
<marker date="1583590171926" expanded="false" signature="8793:8799" ph=" " />
<marker date="1583590171926" expanded="false" signature="8883:8930" ph="..." />
<marker date="1583590171926" expanded="false" signature="8932:8938" ph=" " />
<marker date="1583590171926" expanded="false" signature="8938:8944" ph=" " />
<marker date="1583590171926" expanded="false" signature="8944:8950" ph=" " />
<marker date="1583590171926" expanded="false" signature="8950:8956" ph=" " />
<marker date="1583590171926" expanded="false" signature="9016:9063" ph="..." />
<marker date="1583590171926" expanded="false" signature="9065:9071" ph=" " />
<marker date="1583590171926" expanded="false" signature="9071:9077" ph=" " />
<marker date="1583590171926" expanded="false" signature="9077:9083" ph=" " />
<marker date="1583590171926" expanded="false" signature="9083:9089" ph=" " />
<marker date="1583590171926" expanded="false" signature="9273:9320" ph="..." />
<marker date="1583590171926" expanded="false" signature="9322:9328" ph=" " />
<marker date="1583590171926" expanded="false" signature="9328:9334" ph=" " />
<marker date="1583590171926" expanded="false" signature="9334:9340" ph=" " />
<marker date="1583590171926" expanded="false" signature="9340:9346" ph=" " />
<marker date="1583590171926" expanded="false" signature="9474:9521" ph="..." />
<marker date="1583590171926" expanded="false" signature="9523:9529" ph=" " />
<marker date="1583590171926" expanded="false" signature="9529:9535" ph=" " />
<marker date="1583590171926" expanded="false" signature="9535:9541" ph=" " />
<marker date="1583590171926" expanded="false" signature="9541:9547" ph=" " />
<marker date="1583590171926" expanded="false" signature="9648:9666" ph="..." />
<marker date="1583590171926" expanded="true" signature="9667:10167" ph="..." />
<marker date="1583590171926" expanded="false" signature="9695:9761" ph="..." />
<marker date="1583590171926" expanded="false" signature="9802:9849" ph="..." />
<marker date="1583590171926" expanded="false" signature="9851:9857" ph=" " />
<marker date="1583590171926" expanded="false" signature="9857:9863" ph=" " />
<marker date="1583590171926" expanded="false" signature="9863:9869" ph=" " />
<marker date="1583590171926" expanded="false" signature="9869:9875" ph=" " />
<marker date="1583590171926" expanded="false" signature="9987:10034" ph="..." />
<marker date="1583590171926" expanded="false" signature="10036:10042" ph=" " />
<marker date="1583590171926" expanded="false" signature="10042:10048" ph=" " />
<marker date="1583590171926" expanded="false" signature="10048:10054" ph=" " />
<marker date="1583590171926" expanded="false" signature="10054:10060" ph=" " />
<marker date="1583590171926" expanded="false" signature="10191:10209" ph="..." />
<marker date="1583590171926" expanded="true" signature="10210:11210" ph="..." />
<marker date="1583590171926" expanded="false" signature="10238:10304" ph="..." />
<marker date="1583590171926" expanded="false" signature="10343:10390" ph="..." />
<marker date="1583590171926" expanded="false" signature="10392:10398" ph=" " />
<marker date="1583590171926" expanded="false" signature="10398:10404" ph=" " />
<marker date="1583590171926" expanded="false" signature="10404:10410" ph=" " />
<marker date="1583590171926" expanded="false" signature="10410:10416" ph=" " />
<marker date="1583590171926" expanded="false" signature="10482:10529" ph="..." />
<marker date="1583590171926" expanded="false" signature="10531:10537" ph=" " />
<marker date="1583590171926" expanded="false" signature="10537:10543" ph=" " />
<marker date="1583590171926" expanded="false" signature="10543:10549" ph=" " />
<marker date="1583590171926" expanded="false" signature="10549:10555" ph=" " />
<marker date="1583590171926" expanded="false" signature="10612:10659" ph="..." />
<marker date="1583590171926" expanded="false" signature="10661:10667" ph=" " />
<marker date="1583590171926" expanded="false" signature="10667:10673" ph=" " />
<marker date="1583590171926" expanded="false" signature="10673:10679" ph=" " />
<marker date="1583590171926" expanded="false" signature="10679:10685" ph=" " />
<marker date="1583590171926" expanded="false" signature="10763:10810" ph="..." />
<marker date="1583590171926" expanded="false" signature="10812:10818" ph=" " />
<marker date="1583590171926" expanded="false" signature="10818:10824" ph=" " />
<marker date="1583590171926" expanded="false" signature="10824:10830" ph=" " />
<marker date="1583590171926" expanded="false" signature="10830:10836" ph=" " />
<marker date="1583590171926" expanded="false" signature="10929:10976" ph="..." />
<marker date="1583590171926" expanded="false" signature="10978:10984" ph=" " />
<marker date="1583590171926" expanded="false" signature="10984:10990" ph=" " />
<marker date="1583590171926" expanded="false" signature="10990:10996" ph=" " />
<marker date="1583590171926" expanded="false" signature="10996:11002" ph=" " />
<marker date="1583590171926" expanded="false" signature="11076:11123" ph="..." />
<marker date="1583590171926" expanded="false" signature="11125:11131" ph=" " />
<marker date="1583590171926" expanded="false" signature="11131:11137" ph=" " />
<marker date="1583590171926" expanded="false" signature="11137:11143" ph=" " />
<marker date="1583590171926" expanded="false" signature="11143:11149" ph=" " />
<marker date="1583590171926" expanded="false" signature="11234:11314" ph="..." />
<marker date="1583590171926" expanded="false" signature="11375:11455" ph="..." />
<element signature="e#40#74#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="14" column="15" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="78" selection-end-column="3" />
<state relative-caret-position="100">
<caret line="4" column="51" lean-forward="true" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="51" column="54" lean-forward="false" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
<state relative-caret-position="125">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/OrderDetail.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-50">
<caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
<folding>
<element signature="e#40#74#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="575">
<caret line="23" column="24" lean-forward="true" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="24" column="21" lean-forward="true" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
... ... @@ -1572,13 +1273,225 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html">
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/zip/zip.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="51" lean-forward="true" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />
<state relative-caret-position="200">
<caret line="8" column="6" lean-forward="false" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" column="58" lean-forward="false" selection-start-line="20" selection-start-column="54" selection-end-line="20" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="325" column="8" lean-forward="true" selection-start-line="325" selection-start-column="8" selection-end-line="325" selection-end-column="8" />
<folding>
<element signature="e#928#2350#0#PHP" expanded="false" />
<element signature="e#2356#11938#0#PHP" expanded="false" />
<element signature="e#11971#14157#0#PHP" expanded="false" />
<marker date="1590231116553" expanded="true" signature="3701:11482" ph="..." />
<marker date="1590231116553" expanded="true" signature="3719:3854" ph="..." />
<marker date="1590231116553" expanded="false" signature="3739:3805" ph="..." />
<marker date="1590231116553" expanded="false" signature="3878:3925" ph="..." />
<marker date="1590231116553" expanded="true" signature="3926:3964" ph="..." />
<marker date="1590231116553" expanded="false" signature="3988:4015" ph="..." />
<marker date="1590231116553" expanded="true" signature="4016:4171" ph="..." />
<marker date="1590231116553" expanded="false" signature="4195:4211" ph="..." />
<marker date="1590231116553" expanded="true" signature="4212:5259" ph="..." />
<marker date="1590231116553" expanded="false" signature="4238:4282" ph="..." />
<marker date="1590231116553" expanded="true" signature="4283:4361" ph="..." />
<marker date="1590231116553" expanded="false" signature="4313:4325" ph="..." />
<marker date="1590231116553" expanded="false" signature="4385:4429" ph="..." />
<marker date="1590231116553" expanded="true" signature="4430:4508" ph="..." />
<marker date="1590231116553" expanded="false" signature="4461:4473" ph="..." />
<marker date="1590231116553" expanded="false" signature="4532:4576" ph="..." />
<marker date="1590231116553" expanded="true" signature="4577:4655" ph="..." />
<marker date="1590231116553" expanded="false" signature="4608:4620" ph="..." />
<marker date="1590231116553" expanded="false" signature="4679:4723" ph="..." />
<marker date="1590231116553" expanded="true" signature="4724:4805" ph="..." />
<marker date="1590231116553" expanded="false" signature="4755:4767" ph="..." />
<marker date="1590231116553" expanded="false" signature="4829:4873" ph="..." />
<marker date="1590231116553" expanded="true" signature="4874:4959" ph="..." />
<marker date="1590231116553" expanded="false" signature="4906:4918" ph="..." />
<marker date="1590231116553" expanded="false" signature="4983:5027" ph="..." />
<marker date="1590231116553" expanded="true" signature="5028:5110" ph="..." />
<marker date="1590231116553" expanded="false" signature="5062:5074" ph="..." />
<marker date="1590231116553" expanded="false" signature="5134:5178" ph="..." />
<marker date="1590231116553" expanded="true" signature="5179:5242" ph="..." />
<marker date="1590231116553" expanded="true" signature="5284:5748" ph="..." />
<marker date="1590231116553" expanded="false" signature="5312:5378" ph="..." />
<marker date="1590231116553" expanded="false" signature="5421:5466" ph="..." />
<marker date="1590231116553" expanded="true" signature="5467:5731" ph="..." />
<marker date="1590231116553" expanded="false" signature="5468:5474" ph=" " />
<marker date="1590231116553" expanded="false" signature="5474:5480" ph=" " />
<marker date="1590231116553" expanded="false" signature="5480:5486" ph=" " />
<marker date="1590231116553" expanded="false" signature="5486:5492" ph=" " />
<marker date="1590231116553" expanded="false" signature="5524:5533" ph="..." />
<marker date="1590231116553" expanded="false" signature="5576:5585" ph="..." />
<marker date="1590231116553" expanded="false" signature="5614:5623" ph="..." />
<marker date="1590231116553" expanded="false" signature="5648:5657" ph="..." />
<marker date="1590231116553" expanded="false" signature="5772:5790" ph="..." />
<marker date="1590231116553" expanded="true" signature="5791:6108" ph="..." />
<marker date="1590231116553" expanded="false" signature="5819:5885" ph="..." />
<marker date="1590231116553" expanded="false" signature="5924:5952" ph="..." />
<marker date="1590231116553" expanded="false" signature="5954:5960" ph=" " />
<marker date="1590231116553" expanded="false" signature="5960:5966" ph=" " />
<marker date="1590231116553" expanded="false" signature="5966:5972" ph=" " />
<marker date="1590231116553" expanded="false" signature="5972:5978" ph=" " />
<marker date="1590231116553" expanded="false" signature="6031:6040" ph="..." />
<marker date="1590231116553" expanded="false" signature="6132:6150" ph="..." />
<marker date="1590231116553" expanded="true" signature="6151:6557" ph="..." />
<marker date="1590231116553" expanded="false" signature="6179:6245" ph="..." />
<marker date="1590231116553" expanded="false" signature="6286:6331" ph="..." />
<marker date="1590231116553" expanded="true" signature="6332:6540" ph="..." />
<marker date="1590231116553" expanded="false" signature="6333:6339" ph=" " />
<marker date="1590231116553" expanded="false" signature="6339:6345" ph=" " />
<marker date="1590231116553" expanded="false" signature="6345:6351" ph=" " />
<marker date="1590231116553" expanded="false" signature="6351:6357" ph=" " />
<marker date="1590231116553" expanded="false" signature="6381:6387" ph=" " />
<marker date="1590231116553" expanded="false" signature="6390:6396" ph=" " />
<marker date="1590231116553" expanded="false" signature="6398:6404" ph=" " />
<marker date="1590231116553" expanded="false" signature="6455:6464" ph="..." />
<marker date="1590231116553" expanded="false" signature="6494:6503" ph="..." />
<marker date="1590231116553" expanded="false" signature="6581:6628" ph="..." />
<marker date="1590231116553" expanded="false" signature="6630:6636" ph=" " />
<marker date="1590231116553" expanded="false" signature="6636:6642" ph=" " />
<marker date="1590231116553" expanded="false" signature="6642:6648" ph=" " />
<marker date="1590231116553" expanded="false" signature="6648:6654" ph=" " />
<marker date="1590231116553" expanded="false" signature="6709:6718" ph="..." />
<marker date="1590231116553" expanded="false" signature="6837:6884" ph="..." />
<marker date="1590231116553" expanded="false" signature="6886:6892" ph=" " />
<marker date="1590231116553" expanded="false" signature="6892:6898" ph=" " />
<marker date="1590231116553" expanded="false" signature="6898:6904" ph=" " />
<marker date="1590231116553" expanded="false" signature="6904:6910" ph=" " />
<marker date="1590231116553" expanded="false" signature="6964:6973" ph="..." />
<marker date="1590231116553" expanded="false" signature="7047:7063" ph="..." />
<marker date="1590231116553" expanded="false" signature="7115:7162" ph="..." />
<marker date="1590231116553" expanded="false" signature="7164:7170" ph=" " />
<marker date="1590231116553" expanded="false" signature="7170:7176" ph=" " />
<marker date="1590231116553" expanded="false" signature="7176:7182" ph=" " />
<marker date="1590231116553" expanded="false" signature="7182:7188" ph=" " />
<marker date="1590231116553" expanded="false" signature="7215:7241" ph="..." />
<marker date="1590231116553" expanded="false" signature="7319:7337" ph="..." />
<marker date="1590231116553" expanded="true" signature="7338:7936" ph="..." />
<marker date="1590231116553" expanded="false" signature="7366:7432" ph="..." />
<marker date="1590231116553" expanded="false" signature="7471:7518" ph="..." />
<marker date="1590231116553" expanded="false" signature="7520:7526" ph=" " />
<marker date="1590231116553" expanded="false" signature="7526:7532" ph=" " />
<marker date="1590231116553" expanded="false" signature="7532:7538" ph=" " />
<marker date="1590231116553" expanded="false" signature="7538:7544" ph=" " />
<marker date="1590231116553" expanded="false" signature="7629:7676" ph="..." />
<marker date="1590231116553" expanded="false" signature="7678:7684" ph=" " />
<marker date="1590231116553" expanded="false" signature="7684:7690" ph=" " />
<marker date="1590231116553" expanded="false" signature="7690:7696" ph=" " />
<marker date="1590231116553" expanded="false" signature="7696:7702" ph=" " />
<marker date="1590231116553" expanded="false" signature="7803:7850" ph="..." />
<marker date="1590231116553" expanded="false" signature="7852:7858" ph=" " />
<marker date="1590231116553" expanded="false" signature="7858:7864" ph=" " />
<marker date="1590231116553" expanded="false" signature="7864:7870" ph=" " />
<marker date="1590231116553" expanded="false" signature="7870:7876" ph=" " />
<marker date="1590231116553" expanded="false" signature="7960:7978" ph="..." />
<marker date="1590231116553" expanded="true" signature="7979:9624" ph="..." />
<marker date="1590231116553" expanded="false" signature="8007:8073" ph="..." />
<marker date="1590231116553" expanded="false" signature="8112:8159" ph="..." />
<marker date="1590231116553" expanded="false" signature="8161:8167" ph=" " />
<marker date="1590231116553" expanded="false" signature="8167:8173" ph=" " />
<marker date="1590231116553" expanded="false" signature="8173:8179" ph=" " />
<marker date="1590231116553" expanded="false" signature="8179:8185" ph=" " />
<marker date="1590231116553" expanded="false" signature="8309:8356" ph="..." />
<marker date="1590231116553" expanded="false" signature="8358:8364" ph=" " />
<marker date="1590231116553" expanded="false" signature="8364:8370" ph=" " />
<marker date="1590231116553" expanded="false" signature="8370:8376" ph=" " />
<marker date="1590231116553" expanded="false" signature="8376:8382" ph=" " />
<marker date="1590231116553" expanded="false" signature="8534:8581" ph="..." />
<marker date="1590231116553" expanded="false" signature="8583:8589" ph=" " />
<marker date="1590231116553" expanded="false" signature="8589:8595" ph=" " />
<marker date="1590231116553" expanded="false" signature="8595:8601" ph=" " />
<marker date="1590231116553" expanded="false" signature="8601:8607" ph=" " />
<marker date="1590231116553" expanded="false" signature="8726:8773" ph="..." />
<marker date="1590231116553" expanded="false" signature="8775:8781" ph=" " />
<marker date="1590231116553" expanded="false" signature="8781:8787" ph=" " />
<marker date="1590231116553" expanded="false" signature="8787:8793" ph=" " />
<marker date="1590231116553" expanded="false" signature="8793:8799" ph=" " />
<marker date="1590231116553" expanded="false" signature="8883:8930" ph="..." />
<marker date="1590231116553" expanded="false" signature="8932:8938" ph=" " />
<marker date="1590231116553" expanded="false" signature="8938:8944" ph=" " />
<marker date="1590231116553" expanded="false" signature="8944:8950" ph=" " />
<marker date="1590231116553" expanded="false" signature="8950:8956" ph=" " />
<marker date="1590231116553" expanded="false" signature="9016:9063" ph="..." />
<marker date="1590231116553" expanded="false" signature="9065:9071" ph=" " />
<marker date="1590231116553" expanded="false" signature="9071:9077" ph=" " />
<marker date="1590231116553" expanded="false" signature="9077:9083" ph=" " />
<marker date="1590231116553" expanded="false" signature="9083:9089" ph=" " />
<marker date="1590231116553" expanded="false" signature="9273:9320" ph="..." />
<marker date="1590231116553" expanded="false" signature="9322:9328" ph=" " />
<marker date="1590231116553" expanded="false" signature="9328:9334" ph=" " />
<marker date="1590231116553" expanded="false" signature="9334:9340" ph=" " />
<marker date="1590231116553" expanded="false" signature="9340:9346" ph=" " />
<marker date="1590231116553" expanded="false" signature="9474:9521" ph="..." />
<marker date="1590231116553" expanded="false" signature="9523:9529" ph=" " />
<marker date="1590231116553" expanded="false" signature="9529:9535" ph=" " />
<marker date="1590231116553" expanded="false" signature="9535:9541" ph=" " />
<marker date="1590231116553" expanded="false" signature="9541:9547" ph=" " />
<marker date="1590231116553" expanded="false" signature="9648:9666" ph="..." />
<marker date="1590231116553" expanded="true" signature="9667:10167" ph="..." />
<marker date="1590231116553" expanded="false" signature="9695:9761" ph="..." />
<marker date="1590231116553" expanded="false" signature="9802:9849" ph="..." />
<marker date="1590231116553" expanded="false" signature="9851:9857" ph=" " />
<marker date="1590231116553" expanded="false" signature="9857:9863" ph=" " />
<marker date="1590231116553" expanded="false" signature="9863:9869" ph=" " />
<marker date="1590231116553" expanded="false" signature="9869:9875" ph=" " />
<marker date="1590231116553" expanded="false" signature="9987:10034" ph="..." />
<marker date="1590231116553" expanded="false" signature="10036:10042" ph=" " />
<marker date="1590231116553" expanded="false" signature="10042:10048" ph=" " />
<marker date="1590231116553" expanded="false" signature="10048:10054" ph=" " />
<marker date="1590231116553" expanded="false" signature="10054:10060" ph=" " />
<marker date="1590231116553" expanded="false" signature="10191:10209" ph="..." />
<marker date="1590231116553" expanded="true" signature="10210:11210" ph="..." />
<marker date="1590231116553" expanded="false" signature="10238:10304" ph="..." />
<marker date="1590231116553" expanded="false" signature="10343:10390" ph="..." />
<marker date="1590231116553" expanded="false" signature="10392:10398" ph=" " />
<marker date="1590231116553" expanded="false" signature="10398:10404" ph=" " />
<marker date="1590231116553" expanded="false" signature="10404:10410" ph=" " />
<marker date="1590231116553" expanded="false" signature="10410:10416" ph=" " />
<marker date="1590231116553" expanded="false" signature="10482:10529" ph="..." />
<marker date="1590231116553" expanded="false" signature="10531:10537" ph=" " />
<marker date="1590231116553" expanded="false" signature="10537:10543" ph=" " />
<marker date="1590231116553" expanded="false" signature="10543:10549" ph=" " />
<marker date="1590231116553" expanded="false" signature="10549:10555" ph=" " />
<marker date="1590231116553" expanded="false" signature="10612:10659" ph="..." />
<marker date="1590231116553" expanded="false" signature="10661:10667" ph=" " />
<marker date="1590231116553" expanded="false" signature="10667:10673" ph=" " />
<marker date="1590231116553" expanded="false" signature="10673:10679" ph=" " />
<marker date="1590231116553" expanded="false" signature="10679:10685" ph=" " />
<marker date="1590231116553" expanded="false" signature="10763:10810" ph="..." />
<marker date="1590231116553" expanded="false" signature="10812:10818" ph=" " />
<marker date="1590231116553" expanded="false" signature="10818:10824" ph=" " />
<marker date="1590231116553" expanded="false" signature="10824:10830" ph=" " />
<marker date="1590231116553" expanded="false" signature="10830:10836" ph=" " />
<marker date="1590231116553" expanded="false" signature="10929:10976" ph="..." />
<marker date="1590231116553" expanded="false" signature="10978:10984" ph=" " />
<marker date="1590231116553" expanded="false" signature="10984:10990" ph=" " />
<marker date="1590231116553" expanded="false" signature="10990:10996" ph=" " />
<marker date="1590231116553" expanded="false" signature="10996:11002" ph=" " />
<marker date="1590231116553" expanded="false" signature="11076:11123" ph="..." />
<marker date="1590231116553" expanded="false" signature="11125:11131" ph=" " />
<marker date="1590231116553" expanded="false" signature="11131:11137" ph=" " />
<marker date="1590231116553" expanded="false" signature="11137:11143" ph=" " />
<marker date="1590231116553" expanded="false" signature="11143:11149" ph=" " />
<marker date="1590231116553" expanded="false" signature="11234:11314" ph="..." />
<marker date="1590231116553" expanded="false" signature="11375:11455" ph="..." />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -291,4 +291,48 @@ class Order extends Backend
}
return $this->view->fetch();
}
/**
* 导出发票信息
*/
public function qrcode_zip()
{
$list = Db::name('invoice')
->select();
foreach ($list as &$val){
$val['user_id'] = Db::name('user')->where('id',$val['user_id'])->value('nickname');
if(!empty($val['order_id'])){
$order_id = explode(',',trim($val['order_id'],','));
$order_id = Db::name('order')->whereIn('id',$order_id)->column('num');
$val['order_id'] = implode(',',$order_id);
}
$val['createtime'] = date('Y-m-d H:i:s',$val['createtime']);
}
ob_end_clean();//清除缓冲区,避免乱码
header('Content-type:application/vnd.ms-excel');
header('Content-Disposition:attachment;filename='. '发票信息' .'.xls');//文件名自己取
$THead = array('id' ,'用户昵称' ,'订单号' ,'公司名称' ,'公司电话','公司地址','纳税人识别号','银行名称','银行账号','收件人名字','收件人电话','收件人地址','创建时间');//这里是要输出的列头
$TBody = $list;
echo '<table>';//以表格的形式输出 也可以字符串拼接
//输出head
echo '<tr>';
foreach ( $THead as $h )
{
echo '<th>' . $h . '</th>';//直接输出即可,
}
echo '</tr>';
//输出body
foreach ( $TBody as $row )
{
echo '<tr>';
foreach ($row as $v) {
echo '<td>' . $v . '</td>';
}
echo '</tr>';
}
echo '</table>';//OK
exit();
}
}
... ...
... ... @@ -7,18 +7,19 @@
<div class="widget-body no-padding">
<div id="toolbar" class="toolbar">
<a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
<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>
<!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
<!--<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>-->
<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>
<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>
<!--<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>-->
<div class="dropdown btn-group {:$auth->check('order/multi')?'':'hide'}">
<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
<ul class="dropdown-menu text-left" role="menu">
<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>
<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>
</ul>
</div>
<!--<div class="dropdown btn-group {:$auth->check('order/multi')?'':'hide'}">-->
<!--<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
<!--<ul class="dropdown-menu text-left" role="menu">-->
<!--<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>-->
<!--<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>-->
<!--</ul>-->
<!--</div>-->
<a href="{:url('qrcode_zip')}" class="btn btn-danger {:$auth->check('order/qrcode_zip')?'':'hide'}" title="{:__('导出')}"> {:__('导出')}</a>
</div>
... ...
... ... @@ -23,6 +23,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id',
columns: [
[
{checkbox: true},
{field: 'id', title: __('Id'), operate:false},
{field: 'user.nickname', title: __('User.nickname')},
{field: 'pic_id', title: __('Pic_id'), operate:false},
... ...