郭盛 / areial · 提交

转到一个项目

作者 unknown
提交 61279e1f89038758efb77a9cfadbca0d88df1e05 1 个父辈 a969a0e8 master
1 个管道 的构建 通过 耗费 13 秒

切换数值

内嵌 并排对比
正在显示 2 个修改的文件 包含 320 行增加 和 570 行删除
... ... @@ -4,12 +4,7 @@
<bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="31" />
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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>
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -17,8 +12,99 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
<leaf>
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382">
<caret line="2439" column="0" lean-forward="true" selection-start-line="2439" selection-start-column="0" selection-end-line="2439" selection-end-column="0" />
<folding>
<element signature="e#4287#4721#0#PHP" expanded="false" />
<element signature="e#4726#5084#0#PHP" expanded="false" />
<element signature="e#5090#5497#0#PHP" expanded="false" />
<element signature="e#5502#5845#0#PHP" expanded="false" />
<element signature="e#5851#6264#0#PHP" expanded="false" />
<element signature="e#6269#6586#0#PHP" expanded="false" />
<element signature="e#6592#7691#0#PHP" expanded="false" />
<element signature="e#7696#14874#0#PHP" expanded="false" />
<element signature="e#7970#8064#0#PHP" expanded="false" />
<element signature="e#8127#12429#0#PHP" expanded="false" />
<element signature="e#8450#9749#0#PHP" expanded="false" />
<element signature="e#12495#12928#0#PHP" expanded="false" />
<element signature="e#12991#13400#0#PHP" expanded="false" />
<element signature="e#13464#13734#0#PHP" expanded="false" />
<element signature="e#13744#14868#0#PHP" expanded="false" />
<element signature="e#14319#14868#0#PHP" expanded="false" />
<element signature="e#14880#15560#0#PHP" expanded="false" />
<element signature="e#15565#16423#0#PHP" expanded="false" />
<element signature="e#16429#17218#0#PHP" expanded="false" />
<element signature="e#17223#18572#0#PHP" expanded="false" />
<element signature="e#18578#19280#0#PHP" expanded="false" />
<element signature="e#19285#20605#0#PHP" expanded="false" />
<element signature="e#20611#21187#0#PHP" expanded="false" />
<element signature="e#21192#21804#0#PHP" expanded="false" />
<element signature="e#21810#22526#0#PHP" expanded="false" />
<element signature="e#22531#27399#0#PHP" expanded="false" />
<element signature="e#27408#28338#0#PHP" expanded="false" />
<element signature="e#28343#33484#0#PHP" expanded="false" />
<element signature="e#33490#33867#0#PHP" expanded="false" />
<element signature="e#33872#34311#0#PHP" expanded="false" />
<element signature="e#34317#35138#0#PHP" expanded="false" />
<element signature="e#35143#38547#0#PHP" expanded="false" />
<element signature="e#38553#39058#0#PHP" expanded="false" />
<element signature="e#39063#39314#0#PHP" expanded="false" />
<element signature="e#39320#39799#0#PHP" expanded="false" />
<element signature="e#39804#40561#0#PHP" expanded="false" />
<element signature="e#40567#41048#0#PHP" expanded="false" />
<element signature="e#41053#41923#0#PHP" expanded="false" />
<element signature="e#41929#42292#0#PHP" expanded="false" />
<element signature="e#42297#42488#0#PHP" expanded="false" />
<element signature="e#42494#42852#0#PHP" expanded="false" />
<element signature="e#42857#43048#0#PHP" expanded="false" />
<element signature="e#43054#44197#0#PHP" expanded="false" />
<element signature="e#44202#46867#0#PHP" expanded="false" />
<element signature="e#46873#47371#0#PHP" expanded="false" />
<element signature="e#47376#49122#0#PHP" expanded="false" />
<element signature="e#49128#49541#0#PHP" expanded="false" />
<element signature="e#49546#50025#0#PHP" expanded="false" />
<element signature="e#50031#50565#0#PHP" expanded="false" />
<element signature="e#50570#51955#0#PHP" expanded="false" />
<element signature="e#51961#52615#0#PHP" expanded="false" />
<element signature="e#52620#54635#0#PHP" expanded="false" />
<element signature="e#54641#55401#0#PHP" expanded="false" />
<element signature="e#55406#58115#0#PHP" expanded="false" />
<element signature="e#58141#58972#0#PHP" expanded="false" />
<element signature="e#58978#59398#0#PHP" expanded="false" />
<element signature="e#59403#59886#0#PHP" expanded="false" />
<element signature="e#59892#60698#0#PHP" expanded="false" />
<element signature="e#60703#63861#0#PHP" expanded="false" />
<element signature="e#63876#65211#0#PHP" expanded="false" />
<element signature="e#65227#66261#0#PHP" expanded="false" />
<element signature="e#66267#67025#0#PHP" expanded="false" />
<element signature="e#67030#70773#0#PHP" expanded="false" />
<element signature="e#70779#71171#0#PHP" expanded="false" />
<element signature="e#71176#72128#0#PHP" expanded="false" />
<element signature="e#72152#72725#0#PHP" expanded="false" />
<element signature="e#72731#73330#0#PHP" expanded="false" />
<element signature="e#73335#74262#0#PHP" expanded="false" />
<element signature="e#74268#74982#0#PHP" expanded="false" />
<element signature="e#74988#75415#0#PHP" expanded="false" />
<element signature="e#75420#75889#0#PHP" expanded="false" />
<element signature="e#75896#77101#0#PHP" expanded="false" />
<element signature="e#77106#78809#0#PHP" expanded="false" />
<element signature="e#78815#79592#0#PHP" expanded="false" />
<element signature="e#79597#83535#0#PHP" expanded="false" />
<element signature="e#83541#84050#0#PHP" expanded="false" />
<element signature="e#84055#84727#0#PHP" expanded="false" />
<element signature="e#84733#84972#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
... ... @@ -98,7 +184,6 @@
<option value="$PROJECT_DIR$/application/admin/library/Auth.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Index.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" />
<option value="$PROJECT_DIR$/application/admin/controller/user/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/user/user/index.html" />
... ... @@ -113,6 +198,7 @@
<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" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -130,8 +216,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="149" />
<component name="ProjectFrameBounds">
<option name="x" value="-154" />
<option name="y" value="9" />
<option name="width" value="1747" />
<option name="height" value="1010" />
</component>
... ... @@ -152,27 +239,79 @@
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" 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" />
</path>
</expand>
<select />
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="application" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="application" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="api" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="application" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="api" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="controller" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../fastadmin/room" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="settings.editor.selected.configurable" value="preferences.keymap" />
</component>
... ... @@ -203,6 +342,69 @@
</list>
</option>
</component>
<component name="RunManager">
<configuration default="true" type="CodeceptionConfigurationType" factoryName="Codeception">
<PhpTestRunnerSettings />
<method />
</configuration>
<configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
<node-interpreter value="project" />
<working-dir value="" />
<envs />
<scope-kind value="ALL" />
<method />
</configuration>
<configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
<config-file value="" />
<node-interpreter value="project" />
<envs />
<method />
</configuration>
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
<method />
</configuration>
<configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
<method />
</configuration>
<configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
<TestRunner />
<method />
</configuration>
<configuration default="true" type="PhpBehatConfigurationType" factoryName="Behat">
<BehatRunner />
<method />
</configuration>
<configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
<method />
</configuration>
<configuration default="true" type="PhpSpecConfigurationType" factoryName="PHPSpec">
<PhpTestRunnerSettings />
<method />
</configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<method />
</configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm">
<command value="run" />
<scripts />
<node-interpreter value="project" />
<envs />
<method />
</configuration>
<configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
<node-interpreter>project</node-interpreter>
<node-options />
<working-directory />
<pass-parent-env>true</pass-parent-env>
<envs />
<ui />
<extra-mocha-options />
<test-kind>DIRECTORY</test-kind>
<test-directory />
<recursive>false</recursive>
<method />
</configuration>
</component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
</component>
... ... @@ -337,6 +539,7 @@
<workItem from="1590141410628" duration="1864000" />
<workItem from="1590193431145" duration="1982000" />
<workItem from="1590217205221" duration="12032000" />
<workItem from="1590280044844" duration="101000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -559,7 +762,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="692996000" />
<option name="totallyTimeSpent" value="693097000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -571,25 +774,28 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="149" y="0" width="1747" height="1010" extended-state="1" />
<frame x="-154" y="9" width="1747" height="1010" extended-state="0" />
<editor active="true" />
<layout>
<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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14997037" 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="调试" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<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" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="运行" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.449711" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
<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" />
... ... @@ -612,7 +818,7 @@
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
<option name="processedProjectFiles" value="true" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
... ... @@ -668,13 +874,7 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/助通短信平台账号/PHP_G_DEMO.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1050">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/助通短信平台账号/PHP_G_DEMO.php" />
<entry file="file://$PROJECT_DIR$/application/nsms/nsms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
... ... @@ -682,13 +882,7 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/助通短信平台账号/php_Nsms_demo.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="73" column="58" lean-forward="true" selection-start-line="73" selection-start-column="58" selection-end-line="73" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/助通短信平台账号/php_Nsms_demo.php" />
<entry file="file://$PROJECT_DIR$/application/index/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5721">
... ... @@ -724,11 +918,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20200224/FnP4bjIl2npbQgozzDqWFF8jSgyX.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20200224/FnP4bjIl2npbQgozzDqWFF8jSgyX.jpg" />
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_5.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
... ... @@ -757,11 +947,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20200331/Fo7_AuWQX97fjnNLJNARJ4dtjv-E.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20200331/Fo7_AuWQX97fjnNLJNARJ4dtjv-E.png" />
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
... ... @@ -769,13 +955,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Words.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1125">
<caret line="46" column="4" lean-forward="false" selection-start-line="46" selection-start-column="4" selection-end-line="54" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Words.php" />
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
... ... @@ -830,200 +1010,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="169" column="33" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="327" selection-end-column="0" />
<folding>
<marker date="1576229034751" expanded="true" signature="1720:9501" ph="..." />
<marker date="1576229034751" expanded="true" signature="1738:1873" ph="..." />
<marker date="1576229034751" expanded="false" signature="1758:1824" ph="..." />
<marker date="1576229034751" expanded="false" signature="1897:1944" ph="..." />
<marker date="1576229034751" expanded="true" signature="1945:1983" ph="..." />
<marker date="1576229034751" expanded="false" signature="2007:2034" ph="..." />
<marker date="1576229034751" expanded="true" signature="2035:2190" ph="..." />
<marker date="1576229034751" expanded="false" signature="2214:2230" ph="..." />
<marker date="1576229034751" expanded="true" signature="2231:3278" ph="..." />
<marker date="1576229034751" expanded="false" signature="2257:2301" ph="..." />
<marker date="1576229034751" expanded="true" signature="2302:2380" ph="..." />
<marker date="1576229034751" expanded="false" signature="2332:2344" ph="..." />
<marker date="1576229034751" expanded="false" signature="2404:2448" ph="..." />
<marker date="1576229034751" expanded="true" signature="2449:2527" ph="..." />
<marker date="1576229034751" expanded="false" signature="2480:2492" ph="..." />
<marker date="1576229034751" expanded="false" signature="2551:2595" ph="..." />
<marker date="1576229034751" expanded="true" signature="2596:2674" ph="..." />
<marker date="1576229034751" expanded="false" signature="2627:2639" ph="..." />
<marker date="1576229034751" expanded="false" signature="2698:2742" ph="..." />
<marker date="1576229034751" expanded="true" signature="2743:2824" ph="..." />
<marker date="1576229034751" expanded="false" signature="2774:2786" ph="..." />
<marker date="1576229034751" expanded="false" signature="2848:2892" ph="..." />
<marker date="1576229034751" expanded="true" signature="2893:2978" ph="..." />
<marker date="1576229034751" expanded="false" signature="2925:2937" ph="..." />
<marker date="1576229034751" expanded="false" signature="3002:3046" ph="..." />
<marker date="1576229034751" expanded="true" signature="3047:3129" ph="..." />
<marker date="1576229034751" expanded="false" signature="3081:3093" ph="..." />
<marker date="1576229034751" expanded="false" signature="3153:3197" ph="..." />
<marker date="1576229034751" expanded="true" signature="3198:3261" ph="..." />
<marker date="1576229034751" expanded="true" signature="3303:3767" ph="..." />
<marker date="1576229034751" expanded="false" signature="3331:3397" ph="..." />
<marker date="1576229034751" expanded="false" signature="3440:3485" ph="..." />
<marker date="1576229034751" expanded="true" signature="3486:3750" ph="..." />
<marker date="1576229034751" expanded="false" signature="3487:3493" ph=" " />
<marker date="1576229034751" expanded="false" signature="3493:3499" ph=" " />
<marker date="1576229034751" expanded="false" signature="3499:3505" ph=" " />
<marker date="1576229034751" expanded="false" signature="3505:3511" ph=" " />
<marker date="1576229034751" expanded="false" signature="3543:3552" ph="..." />
<marker date="1576229034751" expanded="false" signature="3595:3604" ph="..." />
<marker date="1576229034751" expanded="false" signature="3633:3642" ph="..." />
<marker date="1576229034751" expanded="false" signature="3667:3676" ph="..." />
<marker date="1576229034751" expanded="false" signature="3791:3809" ph="..." />
<marker date="1576229034751" expanded="true" signature="3810:4127" ph="..." />
<marker date="1576229034751" expanded="false" signature="3838:3904" ph="..." />
<marker date="1576229034751" expanded="false" signature="3943:3971" ph="..." />
<marker date="1576229034751" expanded="false" signature="3973:3979" ph=" " />
<marker date="1576229034751" expanded="false" signature="3979:3985" ph=" " />
<marker date="1576229034751" expanded="false" signature="3985:3991" ph=" " />
<marker date="1576229034751" expanded="false" signature="3991:3997" ph=" " />
<marker date="1576229034751" expanded="false" signature="4050:4059" ph="..." />
<marker date="1576229034751" expanded="false" signature="4151:4169" ph="..." />
<marker date="1576229034751" expanded="true" signature="4170:4576" ph="..." />
<marker date="1576229034751" expanded="false" signature="4198:4264" ph="..." />
<marker date="1576229034751" expanded="false" signature="4305:4350" ph="..." />
<marker date="1576229034751" expanded="true" signature="4351:4559" ph="..." />
<marker date="1576229034751" expanded="false" signature="4352:4358" ph=" " />
<marker date="1576229034751" expanded="false" signature="4358:4364" ph=" " />
<marker date="1576229034751" expanded="false" signature="4364:4370" ph=" " />
<marker date="1576229034751" expanded="false" signature="4370:4376" ph=" " />
<marker date="1576229034751" expanded="false" signature="4400:4406" ph=" " />
<marker date="1576229034751" expanded="false" signature="4409:4415" ph=" " />
<marker date="1576229034751" expanded="false" signature="4417:4423" ph=" " />
<marker date="1576229034751" expanded="false" signature="4474:4483" ph="..." />
<marker date="1576229034751" expanded="false" signature="4513:4522" ph="..." />
<marker date="1576229034751" expanded="false" signature="4600:4647" ph="..." />
<marker date="1576229034751" expanded="false" signature="4649:4655" ph=" " />
<marker date="1576229034751" expanded="false" signature="4655:4661" ph=" " />
<marker date="1576229034751" expanded="false" signature="4661:4667" ph=" " />
<marker date="1576229034751" expanded="false" signature="4667:4673" ph=" " />
<marker date="1576229034751" expanded="false" signature="4728:4737" ph="..." />
<marker date="1576229034751" expanded="false" signature="4856:4903" ph="..." />
<marker date="1576229034751" expanded="false" signature="4905:4911" ph=" " />
<marker date="1576229034751" expanded="false" signature="4911:4917" ph=" " />
<marker date="1576229034751" expanded="false" signature="4917:4923" ph=" " />
<marker date="1576229034751" expanded="false" signature="4923:4929" ph=" " />
<marker date="1576229034751" expanded="false" signature="4983:4992" ph="..." />
<marker date="1576229034751" expanded="false" signature="5066:5082" ph="..." />
<marker date="1576229034751" expanded="false" signature="5134:5181" ph="..." />
<marker date="1576229034751" expanded="false" signature="5183:5189" ph=" " />
<marker date="1576229034751" expanded="false" signature="5189:5195" ph=" " />
<marker date="1576229034751" expanded="false" signature="5195:5201" ph=" " />
<marker date="1576229034751" expanded="false" signature="5201:5207" ph=" " />
<marker date="1576229034751" expanded="false" signature="5234:5260" ph="..." />
<marker date="1576229034751" expanded="false" signature="5338:5356" ph="..." />
<marker date="1576229034751" expanded="true" signature="5357:5955" ph="..." />
<marker date="1576229034751" expanded="false" signature="5385:5451" ph="..." />
<marker date="1576229034751" expanded="false" signature="5490:5537" ph="..." />
<marker date="1576229034751" expanded="false" signature="5539:5545" ph=" " />
<marker date="1576229034751" expanded="false" signature="5545:5551" ph=" " />
<marker date="1576229034751" expanded="false" signature="5551:5557" ph=" " />
<marker date="1576229034751" expanded="false" signature="5557:5563" ph=" " />
<marker date="1576229034751" expanded="false" signature="5648:5695" ph="..." />
<marker date="1576229034751" expanded="false" signature="5697:5703" ph=" " />
<marker date="1576229034751" expanded="false" signature="5703:5709" ph=" " />
<marker date="1576229034751" expanded="false" signature="5709:5715" ph=" " />
<marker date="1576229034751" expanded="false" signature="5715:5721" ph=" " />
<marker date="1576229034751" expanded="false" signature="5822:5869" ph="..." />
<marker date="1576229034751" expanded="false" signature="5871:5877" ph=" " />
<marker date="1576229034751" expanded="false" signature="5877:5883" ph=" " />
<marker date="1576229034751" expanded="false" signature="5883:5889" ph=" " />
<marker date="1576229034751" expanded="false" signature="5889:5895" ph=" " />
<marker date="1576229034751" expanded="false" signature="5979:5997" ph="..." />
<marker date="1576229034751" expanded="true" signature="5998:7643" ph="..." />
<marker date="1576229034751" expanded="false" signature="6026:6092" ph="..." />
<marker date="1576229034751" expanded="false" signature="6131:6178" ph="..." />
<marker date="1576229034751" expanded="false" signature="6180:6186" ph=" " />
<marker date="1576229034751" expanded="false" signature="6186:6192" ph=" " />
<marker date="1576229034751" expanded="false" signature="6192:6198" ph=" " />
<marker date="1576229034751" expanded="false" signature="6198:6204" ph=" " />
<marker date="1576229034751" expanded="false" signature="6328:6375" ph="..." />
<marker date="1576229034751" expanded="false" signature="6377:6383" ph=" " />
<marker date="1576229034751" expanded="false" signature="6383:6389" ph=" " />
<marker date="1576229034751" expanded="false" signature="6389:6395" ph=" " />
<marker date="1576229034751" expanded="false" signature="6395:6401" ph=" " />
<marker date="1576229034751" expanded="false" signature="6553:6600" ph="..." />
<marker date="1576229034751" expanded="false" signature="6602:6608" ph=" " />
<marker date="1576229034751" expanded="false" signature="6608:6614" ph=" " />
<marker date="1576229034751" expanded="false" signature="6614:6620" ph=" " />
<marker date="1576229034751" expanded="false" signature="6620:6626" ph=" " />
<marker date="1576229034751" expanded="false" signature="6745:6792" ph="..." />
<marker date="1576229034751" expanded="false" signature="6794:6800" ph=" " />
<marker date="1576229034751" expanded="false" signature="6800:6806" ph=" " />
<marker date="1576229034751" expanded="false" signature="6806:6812" ph=" " />
<marker date="1576229034751" expanded="false" signature="6812:6818" ph=" " />
<marker date="1576229034751" expanded="false" signature="6902:6949" ph="..." />
<marker date="1576229034751" expanded="false" signature="6951:6957" ph=" " />
<marker date="1576229034751" expanded="false" signature="6957:6963" ph=" " />
<marker date="1576229034751" expanded="false" signature="6963:6969" ph=" " />
<marker date="1576229034751" expanded="false" signature="6969:6975" ph=" " />
<marker date="1576229034751" expanded="false" signature="7035:7082" ph="..." />
<marker date="1576229034751" expanded="false" signature="7084:7090" ph=" " />
<marker date="1576229034751" expanded="false" signature="7090:7096" ph=" " />
<marker date="1576229034751" expanded="false" signature="7096:7102" ph=" " />
<marker date="1576229034751" expanded="false" signature="7102:7108" ph=" " />
<marker date="1576229034751" expanded="false" signature="7292:7339" ph="..." />
<marker date="1576229034751" expanded="false" signature="7341:7347" ph=" " />
<marker date="1576229034751" expanded="false" signature="7347:7353" ph=" " />
<marker date="1576229034751" expanded="false" signature="7353:7359" ph=" " />
<marker date="1576229034751" expanded="false" signature="7359:7365" ph=" " />
<marker date="1576229034751" expanded="false" signature="7493:7540" ph="..." />
<marker date="1576229034751" expanded="false" signature="7542:7548" ph=" " />
<marker date="1576229034751" expanded="false" signature="7548:7554" ph=" " />
<marker date="1576229034751" expanded="false" signature="7554:7560" ph=" " />
<marker date="1576229034751" expanded="false" signature="7560:7566" ph=" " />
<marker date="1576229034751" expanded="false" signature="7667:7685" ph="..." />
<marker date="1576229034751" expanded="true" signature="7686:8186" ph="..." />
<marker date="1576229034751" expanded="false" signature="7714:7780" ph="..." />
<marker date="1576229034751" expanded="false" signature="7821:7868" ph="..." />
<marker date="1576229034751" expanded="false" signature="7870:7876" ph=" " />
<marker date="1576229034751" expanded="false" signature="7876:7882" ph=" " />
<marker date="1576229034751" expanded="false" signature="7882:7888" ph=" " />
<marker date="1576229034751" expanded="false" signature="7888:7894" ph=" " />
<marker date="1576229034751" expanded="false" signature="8006:8053" ph="..." />
<marker date="1576229034751" expanded="false" signature="8055:8061" ph=" " />
<marker date="1576229034751" expanded="false" signature="8061:8067" ph=" " />
<marker date="1576229034751" expanded="false" signature="8067:8073" ph=" " />
<marker date="1576229034751" expanded="false" signature="8073:8079" ph=" " />
<marker date="1576229034751" expanded="false" signature="8210:8228" ph="..." />
<marker date="1576229034751" expanded="true" signature="8229:9229" ph="..." />
<marker date="1576229034751" expanded="false" signature="8257:8323" ph="..." />
<marker date="1576229034751" expanded="false" signature="8362:8409" ph="..." />
<marker date="1576229034751" expanded="false" signature="8411:8417" ph=" " />
<marker date="1576229034751" expanded="false" signature="8417:8423" ph=" " />
<marker date="1576229034751" expanded="false" signature="8423:8429" ph=" " />
<marker date="1576229034751" expanded="false" signature="8429:8435" ph=" " />
<marker date="1576229034751" expanded="false" signature="8501:8548" ph="..." />
<marker date="1576229034751" expanded="false" signature="8550:8556" ph=" " />
<marker date="1576229034751" expanded="false" signature="8556:8562" ph=" " />
<marker date="1576229034751" expanded="false" signature="8562:8568" ph=" " />
<marker date="1576229034751" expanded="false" signature="8568:8574" ph=" " />
<marker date="1576229034751" expanded="false" signature="8631:8678" ph="..." />
<marker date="1576229034751" expanded="false" signature="8680:8686" ph=" " />
<marker date="1576229034751" expanded="false" signature="8686:8692" ph=" " />
<marker date="1576229034751" expanded="false" signature="8692:8698" ph=" " />
<marker date="1576229034751" expanded="false" signature="8698:8704" ph=" " />
<marker date="1576229034751" expanded="false" signature="8782:8829" ph="..." />
<marker date="1576229034751" expanded="false" signature="8831:8837" ph=" " />
<marker date="1576229034751" expanded="false" signature="8837:8843" ph=" " />
<marker date="1576229034751" expanded="false" signature="8843:8849" ph=" " />
<marker date="1576229034751" expanded="false" signature="8849:8855" ph=" " />
<marker date="1576229034751" expanded="false" signature="8948:8995" ph="..." />
<marker date="1576229034751" expanded="false" signature="8997:9003" ph=" " />
<marker date="1576229034751" expanded="false" signature="9003:9009" ph=" " />
<marker date="1576229034751" expanded="false" signature="9009:9015" ph=" " />
<marker date="1576229034751" expanded="false" signature="9015:9021" ph=" " />
<marker date="1576229034751" expanded="false" signature="9095:9142" ph="..." />
<marker date="1576229034751" expanded="false" signature="9144:9150" ph=" " />
<marker date="1576229034751" expanded="false" signature="9150:9156" ph=" " />
<marker date="1576229034751" expanded="false" signature="9156:9162" ph=" " />
<marker date="1576229034751" expanded="false" signature="9162:9168" ph=" " />
<marker date="1576229034751" expanded="false" signature="9253:9333" ph="..." />
<marker date="1576229034751" expanded="false" signature="9394:9474" ph="..." />
</folding>
<folding />
</state>
</provider>
</entry>
... ... @@ -1084,7 +1071,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="205">
<caret line="250" column="9" lean-forward="true" selection-start-line="250" selection-start-column="9" selection-end-line="250" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
... ... @@ -1092,17 +1078,87 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-118">
<caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
<folding>
<element signature="e#700#2169#0#PHP" expanded="false" />
<element signature="e#2201#6736#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/model/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/user/user/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" column="51" lean-forward="false" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/user/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="27" column="39" lean-forward="false" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/OrderDetail.php" />
<entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html" />
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html">
<provider selected="true" editor-type-id="text-editor">
<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" />
</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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order_detail.js" />
<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="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" />
</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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="796" column="0" lean-forward="true" selection-start-line="796" selection-start-column="0" selection-end-line="796" selection-end-column="0" />
<state relative-caret-position="382">
<caret line="2439" column="0" lean-forward="true" selection-start-line="2439" selection-start-column="0" selection-end-line="2439" selection-end-column="0" />
<folding>
<element signature="e#4287#4721#0#PHP" expanded="false" />
<element signature="e#4726#5084#0#PHP" expanded="false" />
... ... @@ -1182,313 +1238,6 @@
<element signature="e#83541#84050#0#PHP" expanded="false" />
<element signature="e#84055#84727#0#PHP" expanded="false" />
<element signature="e#84733#84972#0#PHP" expanded="false" />
<element signature="e#84977#85060#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/model/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
<folding>
<element signature="e#619#1611#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/user/user/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" column="51" lean-forward="false" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />
<folding>
<element signature="n#div#1;n#div#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/user/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="27" column="39" lean-forward="false" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/OrderDetail.php">
<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>
</provider>
</entry>
<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>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<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/view/order/index.html">
<provider selected="true" editor-type-id="text-editor">
<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>
<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>
<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="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>
... ...
... ... @@ -2452,7 +2452,8 @@ class User extends Api
*/
public function change()
{
$this->success('success',['type'=>0]);
$this->success('success',['type'=>1]);
}
... ...