Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 90e8f82e by 叶明星
Options

Merge branch 'ymx-账期管理-2018091009' into development

parents 17db7a09 5100e3c5
Inline Side-by-side
Showing with 36 additions and 87 deletions
.idea/workspace.xml
...@@ -4,9 +4,7 @@ ...@@ -4,9 +4,7 @@
<bookmark url="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js" line="7" /> <bookmark url="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js" line="7" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4b4c9130-b911-40a1-ad7c-6495f4778010" name="默认的" comment=""> <list default="true" id="4b4c9130-b911-40a1-ad7c-6495f4778010" name="默认的" comment="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/layouts/header.blade.php" afterPath="$PROJECT_DIR$/resources/views/layouts/header.blade.php" />
</list>
<ignored path="Order.iws" /> <ignored path="Order.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
<ignored path=".idea/dataSources.local.xml" /> <ignored path=".idea/dataSources.local.xml" />
...@@ -47,7 +45,7 @@ ...@@ -47,7 +45,7 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="header.blade.php" pinned="false" current-in-tab="true"> <file leaf-file-name="header.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/header.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/header.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="300">
...@@ -57,25 +55,22 @@ ...@@ -57,25 +55,22 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="website.php" pinned="false" current-in-tab="false"> <file leaf-file-name="UploadMonopolyFile.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/website.php"> <entry file="file://$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250"> <state relative-caret-position="175">
<caret line="50" column="19" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="19" /> <caret line="7" column="19" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="OrderController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="website.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/OrderController.php"> <entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="41875"> <state relative-caret-position="1250">
<caret line="1684" column="50" selection-start-line="1684" selection-start-column="45" selection-end-line="1684" selection-end-column="50" /> <caret line="50" column="19" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="19" />
<folding> <folding />
<marker date="1539064767941" expanded="true" signature="16522:16622" placeholder="SELECT * FRO... department" />
<marker date="1539064767941" expanded="true" signature="16563:16621" placeholder="SELECT depar... department" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -128,14 +123,12 @@ ...@@ -128,14 +123,12 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="WebController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="composer.json" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WebController.php"> <entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2675"> <state relative-caret-position="825">
<caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" /> <caret line="33" column="9" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
<folding> <folding />
<element signature="e#40#71#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -173,6 +166,7 @@ ...@@ -173,6 +166,7 @@
<option value="$PROJECT_DIR$/public/js/AuthPaymentDays.js" /> <option value="$PROJECT_DIR$/public/js/AuthPaymentDays.js" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" /> <option value="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/header.blade.php" /> <option value="$PROJECT_DIR$/resources/views/layouts/header.blade.php" />
<option value="$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -245,60 +239,6 @@ ...@@ -245,60 +239,6 @@
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="layouts" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="Scope" />
...@@ -359,12 +299,12 @@ ...@@ -359,12 +299,12 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1539065019417</updated> <updated>1539065019417</updated>
<workItem from="1539065020769" duration="33480000" /> <workItem from="1539065020769" duration="33480000" />
<workItem from="1539167536899" duration="26000" /> <workItem from="1539167536899" duration="1228000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="33506000" /> <option name="totallyTimeSpent" value="34708000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="68" y="-8" width="1860" height="1096" extended-state="6" /> <frame x="68" y="-8" width="1860" height="1096" extended-state="6" />
...@@ -610,14 +550,6 @@ ...@@ -610,14 +550,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="825">
<caret line="33" column="9" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/OrderController.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/OrderController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="41875"> <state relative-caret-position="41875">
...@@ -712,5 +644,21 @@ ...@@ -712,5 +644,21 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="19" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="825">
<caret line="33" column="9" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment