Commit 1bb7d019 authored by superman's avatar superman

update theme

parent 65f4fa22
......@@ -2,9 +2,37 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="ec208c71-5ff8-4642-a786-fad4f24be9b8" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/components/MainHeader/MainHeader.jsx" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/components/MainHeader/MainHeader.less" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/variable.less" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/components/MainHeader.jsx" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/dist/index.css" afterPath="$PROJECT_DIR$/dist/index.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/dist/index.js" afterPath="$PROJECT_DIR$/dist/index.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/components/Layout/Layout.less" afterPath="$PROJECT_DIR$/src/components/Layout/Layout.less" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Announcement/AddItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Announcement/AddItem.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Announcement/List.jsx" afterPath="$PROJECT_DIR$/src/containers/Announcement/List.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/App/App.jsx" afterPath="$PROJECT_DIR$/src/containers/App/App.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/App/App.less" afterPath="$PROJECT_DIR$/src/containers/App/App.less" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.jsx" afterPath="$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/CustomMessage/AddItem.jsx" afterPath="$PROJECT_DIR$/src/containers/CustomMessage/AddItem.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/CustomMessage/Item.jsx" afterPath="$PROJECT_DIR$/src/containers/CustomMessage/Item.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/CustomMessage/List.jsx" afterPath="$PROJECT_DIR$/src/containers/CustomMessage/List.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Product/AddItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Product/AddItem.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Product/EditItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Product/EditItem.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Product/List.jsx" afterPath="$PROJECT_DIR$/src/containers/Product/List.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Product/Product.less" afterPath="$PROJECT_DIR$/src/containers/Product/Product.less" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Remittance/List.jsx" afterPath="$PROJECT_DIR$/src/containers/Remittance/List.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Trade/AddItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Trade/AddItem.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Trade/Commission.jsx" afterPath="$PROJECT_DIR$/src/containers/Trade/Commission.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Trade/Contract.jsx" afterPath="$PROJECT_DIR$/src/containers/Trade/Contract.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Trade/Item.jsx" afterPath="$PROJECT_DIR$/src/containers/Trade/Item.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Trade/List.jsx" afterPath="$PROJECT_DIR$/src/containers/Trade/List.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Withdraw/List.jsx" afterPath="$PROJECT_DIR$/src/containers/Withdraw/List.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Withdraw/PassItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Withdraw/PassItem.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/entries/index.less" afterPath="$PROJECT_DIR$/src/entries/index.less" />
</list>
<ignored path="shuniu-admin.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -27,21 +55,21 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="utils.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/utils.js">
<file leaf-file-name="index.less" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/entries/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="447">
<caret line="142" column="33" selection-start-line="142" selection-start-column="13" selection-end-line="142" selection-end-column="33" />
<state relative-caret-position="315">
<caret line="83" column="26" selection-start-line="83" selection-start-column="26" selection-end-line="83" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShouyiYongjingForm.jsx" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/ShouyiYongjingForm.jsx">
<file leaf-file-name="AddItem.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/CustomMessage/AddItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="154" column="114" selection-start-line="154" selection-start-column="114" selection-end-line="154" selection-end-column="114" />
<state relative-caret-position="342">
<caret line="69" column="99" selection-start-line="67" selection-start-column="12" selection-end-line="69" selection-end-column="99" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
......@@ -49,11 +77,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="BaseInfoForm.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx">
<file leaf-file-name="BaseUpload.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="94" column="8" selection-start-line="94" selection-start-column="8" selection-end-line="94" selection-end-column="81" />
<state relative-caret-position="162">
<caret line="53" column="33" selection-start-line="53" selection-start-column="33" selection-end-line="53" selection-end-column="33" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
......@@ -61,47 +89,43 @@
</provider>
</entry>
</file>
<file leaf-file-name="product.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/reducers/product.js">
<file leaf-file-name="BaseInfoForm.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="522">
<caret line="50" column="6" selection-start-line="50" selection-start-column="6" selection-end-line="50" selection-end-column="6" />
<state relative-caret-position="375">
<caret line="104" column="21" selection-start-line="104" selection-start-column="21" selection-end-line="104" selection-end-column="21" />
<folding>
<element signature="e#0#44#0" expanded="true" />
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="List.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Product/List.jsx">
<file leaf-file-name="Product.less" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Product/Product.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="165" column="34" selection-start-line="165" selection-start-column="34" selection-end-line="165" selection-end-column="34" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
<state relative-caret-position="420">
<caret line="28" column="38" selection-start-line="28" selection-start-column="38" selection-end-line="28" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DateTimeStatusForm.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/DateTimeStatusForm.jsx">
<file leaf-file-name="AddItem.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/AddItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192">
<caret line="44" column="58" selection-start-line="44" selection-start-column="8" selection-end-line="44" selection-end-column="58" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
<state relative-caret-position="492">
<caret line="65" column="10" selection-start-line="50" selection-start-column="8" selection-end-line="65" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="EditItem.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Product/EditItem.jsx">
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="567">
<caret line="85" column="50" selection-start-line="85" selection-start-column="50" selection-end-line="85" selection-end-column="50" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
......@@ -109,35 +133,33 @@
</provider>
</entry>
</file>
<file leaf-file-name="AddItem.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Product/AddItem.jsx">
<file leaf-file-name="List.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Product/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="615">
<caret line="104" column="6" selection-start-line="100" selection-start-column="4" selection-end-line="104" selection-end-column="6" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
<state relative-caret-position="30">
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="82" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/entries/index.js">
<file leaf-file-name="List.jsx" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/containers/Trade/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="495">
<caret line="84" column="14" selection-start-line="84" selection-start-column="14" selection-end-line="84" selection-end-column="14" />
<folding>
<element signature="e#0#22#0" expanded="true" />
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.less" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/entries/index.less">
<file leaf-file-name="List.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
<state relative-caret-position="297">
<caret line="138" column="10" selection-start-line="122" selection-start-column="8" selection-end-line="138" selection-end-column="10" />
<folding />
</state>
</provider>
......@@ -156,14 +178,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/reducers/audit.js" />
<option value="$PROJECT_DIR$/src/sagas/audit.js" />
<option value="$PROJECT_DIR$/src/services/xFetch.js" />
<option value="$PROJECT_DIR$/src/services/announcement.js" />
<option value="$PROJECT_DIR$/src/containers/Remittance/Audit/EditItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Trade/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Remittance/DrawMoney/PassItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Remittance/DrawMoney/List.jsx" />
<option value="$PROJECT_DIR$/src/services/withdraw.js" />
<option value="$PROJECT_DIR$/src/services/remittance.js" />
<option value="$PROJECT_DIR$/src/sagas/remittance.js" />
......@@ -180,13 +194,7 @@
<option value="$PROJECT_DIR$/proxy.config.js" />
<option value="$PROJECT_DIR$/src/services/customMessage.js" />
<option value="$PROJECT_DIR$/src/sagas/customMessage.js" />
<option value="$PROJECT_DIR$/src/containers/CustomMessage/List.jsx" />
<option value="$PROJECT_DIR$/src/components/ProductForm/HuikuanInfoForm.jsx" />
<option value="$PROJECT_DIR$/src/containers/Announcement/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Announcement/List.jsx" />
<option value="$PROJECT_DIR$/src/containers/CustomMessage/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Withdraw/List.jsx" />
<option value="$PROJECT_DIR$/src/containers/Remittance/List.jsx" />
<option value="$PROJECT_DIR$/src/containers/CustomMessage/Item.jsx" />
<option value="$PROJECT_DIR$/src/containers/Trade/Item.jsx" />
<option value="$PROJECT_DIR$/src/containers/index.js" />
......@@ -197,16 +205,30 @@
<option value="$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.less" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.jsx" />
<option value="$PROJECT_DIR$/src/containers/App/App.jsx" />
<option value="$PROJECT_DIR$/src/containers/Trade/List.jsx" />
<option value="$PROJECT_DIR$/src/components/MainHeader.jsx" />
<option value="$PROJECT_DIR$/src/entries/index.less" />
<option value="$PROJECT_DIR$/src/utils.js" />
<option value="$PROJECT_DIR$/src/containers/Product/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/reducers/product.js" />
<option value="$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx" />
<option value="$PROJECT_DIR$/src/containers/Product/List.jsx" />
<option value="$PROJECT_DIR$/src/components/ProductForm/ShouyiYongjingForm.jsx" />
<option value="$PROJECT_DIR$/src/containers/App/App.jsx" />
<option value="$PROJECT_DIR$/src/components/MainHeader.jsx" />
<option value="$PROJECT_DIR$/src/components/MainHeader/MainHeader.jsx" />
<option value="$PROJECT_DIR$/src/containers/Remittance/List.jsx" />
<option value="$PROJECT_DIR$/src/variable.less" />
<option value="$PROJECT_DIR$/src/containers/Withdraw/List.jsx" />
<option value="$PROJECT_DIR$/src/containers/CustomMessage/List.jsx" />
<option value="$PROJECT_DIR$/src/containers/App/App.less" />
<option value="$PROJECT_DIR$/src/containers/CustomMessage/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/components/Layout/Layout.less" />
<option value="$PROJECT_DIR$/src/components/MainHeader/MainHeader.less" />
<option value="$PROJECT_DIR$/src/containers/Announcement/List.jsx" />
<option value="$PROJECT_DIR$/src/containers/Trade/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Announcement/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Product/List.jsx" />
<option value="$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx" />
<option value="$PROJECT_DIR$/src/entries/index.less" />
<option value="$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx" />
<option value="$PROJECT_DIR$/src/containers/Product/Product.less" />
<option value="$PROJECT_DIR$/src/containers/Trade/List.jsx" />
</list>
</option>
</component>
......@@ -291,7 +313,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="reducers" />
<option name="myItemId" value="entries" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
......@@ -309,7 +331,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="entries" />
<option name="myItemId" value="containers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
......@@ -330,6 +352,10 @@
<option name="myItemId" value="containers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Withdraw" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
......@@ -353,6 +379,28 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="containers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Remittance" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
......@@ -375,6 +423,50 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="containers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="CustomMessage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="containers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="BaseFunction" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
......@@ -411,7 +503,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="components" />
<option name="myItemId" value="containers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Announcement" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
......@@ -437,6 +533,68 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="components" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="components" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="MainHeader" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="components" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Layout" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
......@@ -492,11 +650,11 @@
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/components/MainHeader" />
<recent name="$PROJECT_DIR$/src/components/CopyToClipboard" />
<recent name="$PROJECT_DIR$/src/containers/Remittance" />
<recent name="$PROJECT_DIR$/src/containers" />
<recent name="$PROJECT_DIR$/src/containers/Remittance/Audit" />
<recent name="$PROJECT_DIR$/src/containers/Audit" />
</key>
</component>
<component name="RunManager">
......@@ -928,12 +1086,12 @@
<workItem from="1468394206076" duration="1879000" />
<workItem from="1468396235889" duration="33823000" />
<workItem from="1468540294765" duration="94258000" />
<workItem from="1468995021353" duration="149066000" />
<workItem from="1468995021353" duration="165316000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="279026000" />
<option name="totallyTimeSpent" value="295276000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -1018,293 +1176,289 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/containers/Withdraw/PassItem.jsx">
<entry file="file://$PROJECT_DIR$/src/reducers/announcement.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1005">
<caret line="118" column="31" selection-start-line="118" selection-start-column="31" selection-end-line="118" selection-end-column="31" />
<state relative-caret-position="495">
<caret line="33" column="6" selection-start-line="0" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
<folding>
<element signature="e#0#50#0" expanded="false" />
<element signature="e#0#44#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/proxy.config.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="642">
<caret line="78" column="2" selection-start-line="78" selection-start-column="2" selection-end-line="78" selection-end-column="2" />
<folding>
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/reducers/remittance.js">
<entry file="file://$PROJECT_DIR$/src/services/xFetch.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="394">
<caret line="29" column="21" selection-start-line="29" selection-start-column="11" selection-end-line="29" selection-end-column="21" />
<state relative-caret-position="330">
<caret line="22" column="53" selection-start-line="22" selection-start-column="53" selection-end-line="22" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/withdraw.js">
<entry file="file://$PROJECT_DIR$/src/services/customMessage.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
<state relative-caret-position="60">
<caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
<folding>
<element signature="e#0#30#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/sagas/withdraw.js">
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/HuikuanInfoForm.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282">
<caret line="60" column="23" selection-start-line="60" selection-start-column="23" selection-end-line="60" selection-end-column="23" />
<state relative-caret-position="402">
<caret line="77" column="79" selection-start-line="77" selection-start-column="79" selection-end-line="77" selection-end-column="79" />
<folding>
<element signature="e#0#38#0" expanded="false" />
<element signature="e#0#50#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/reducers/withdraw.js">
<entry file="file://$PROJECT_DIR$/src/sagas/customMessage.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="28" column="37" selection-start-line="28" selection-start-column="37" selection-end-line="28" selection-end-column="37" />
<state relative-caret-position="15">
<caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
<folding>
<element signature="e#0#44#0" expanded="false" />
<element signature="e#0#38#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/user.js">
<entry file="file://$PROJECT_DIR$/src/reducers/customMessage.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="29" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
<state relative-caret-position="480">
<caret line="32" column="14" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
<folding>
<element signature="e#0#30#0" expanded="false" />
<element signature="e#0#44#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx">
<entry file="file://$PROJECT_DIR$/src/containers/CustomMessage/Item.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="134">
<caret line="38" column="29" selection-start-line="38" selection-start-column="29" selection-end-line="38" selection-end-column="29" />
<state relative-caret-position="1500">
<caret line="100" column="38" selection-start-line="100" selection-start-column="30" selection-end-line="100" selection-end-column="38" />
<folding>
<element signature="e#0#50#0" expanded="false" />
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/reducers/todos.js">
<entry file="file://$PROJECT_DIR$/src/containers/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="66" selection-start-line="15" selection-start-column="66" selection-end-line="15" selection-end-column="66" />
<folding>
<element signature="e#0#44#0" expanded="false" />
</folding>
<state relative-caret-position="330">
<caret line="22" column="17" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/reducers/__tests__/todos-test.js">
<entry file="file://$PROJECT_DIR$/src/routes/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<state relative-caret-position="492">
<caret line="74" column="58" selection-start-line="74" selection-start-column="58" selection-end-line="74" selection-end-column="58" />
<folding>
<element signature="e#0#28#0" expanded="false" />
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/announcement.js">
<entry file="file://$PROJECT_DIR$/src/components/CopyToClipboard/CopyToClipboard.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="37" selection-start-line="0" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
<folding>
<element signature="e#0#30#0" expanded="false" />
</folding>
<caret line="14" column="27" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/sagas/announcement.js">
<entry file="file://$PROJECT_DIR$/src/components/CopyToClipboard/CopyToClipboard.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="46" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="110" selection-end-column="0" />
<folding>
<element signature="e#0#38#0" expanded="false" />
</folding>
<state relative-caret-position="267">
<caret line="49" column="12" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/reducers/announcement.js">
<entry file="file://$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="33" column="6" selection-start-line="0" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
<folding>
<element signature="e#0#44#0" expanded="false" />
</folding>
<state relative-caret-position="15">
<caret line="1" column="21" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/proxy.config.js">
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="642">
<caret line="78" column="2" selection-start-line="78" selection-start-column="2" selection-end-line="78" selection-end-column="2" />
<folding>
<element signature="n#!!doc" expanded="false" />
</folding>
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/xFetch.js">
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/DocumentsForm.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="53" selection-start-line="22" selection-start-column="53" selection-end-line="22" selection-end-column="53" />
<state relative-caret-position="225">
<caret line="79" column="16" selection-start-line="79" selection-start-column="16" selection-end-line="79" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/customMessage.js">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
<folding>
<element signature="e#0#30#0" expanded="false" />
</folding>
<state relative-caret-position="30">
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/HuikuanInfoForm.jsx">
<entry file="file://$PROJECT_DIR$/dist/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="402">
<caret line="77" column="79" selection-start-line="77" selection-start-column="79" selection-end-line="77" selection-end-column="79" />
<folding>
<element signature="e#0#50#0" expanded="false" />
</folding>
<state relative-caret-position="240">
<caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/AddItem.jsx">
<entry file="file://$PROJECT_DIR$/src/containers/Trade/Item.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387">
<caret line="60" column="102" selection-start-line="60" selection-start-column="102" selection-end-line="60" selection-end-column="102" />
<folding>
<element signature="e#0#50#0" expanded="false" />
</folding>
<state relative-caret-position="237">
<caret line="121" column="86" selection-start-line="121" selection-start-column="37" selection-end-line="121" selection-end-column="86" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/sagas/customMessage.js">
<entry file="file://$PROJECT_DIR$/src/entries/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#38#0" expanded="false" />
<element signature="e#0#22#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/reducers/customMessage.js">
<entry file="file://$PROJECT_DIR$/src/utils.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="32" column="14" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
<folding>
<element signature="e#0#44#0" expanded="false" />
</folding>
<state relative-caret-position="447">
<caret line="142" column="33" selection-start-line="142" selection-start-column="13" selection-end-line="142" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/CustomMessage/AddItem.jsx">
<entry file="file://$PROJECT_DIR$/src/containers/Product/EditItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="60" column="86" selection-start-line="60" selection-start-column="86" selection-end-line="60" selection-end-column="86" />
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Withdraw/List.jsx">
<entry file="file://$PROJECT_DIR$/src/containers/Product/AddItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="54" column="48" selection-start-line="54" selection-start-column="48" selection-end-line="54" selection-end-column="48" />
<state relative-caret-position="615">
<caret line="104" column="6" selection-start-line="100" selection-start-column="4" selection-end-line="104" selection-end-column="6" />
<folding>
<element signature="e#0#50#0" expanded="false" />
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Remittance/List.jsx">
<entry file="file://$PROJECT_DIR$/src/reducers/product.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="449">
<caret line="120" column="45" selection-start-line="120" selection-start-column="45" selection-end-line="120" selection-end-column="45" />
<state relative-caret-position="522">
<caret line="50" column="6" selection-start-line="50" selection-start-column="6" selection-end-line="50" selection-end-column="6" />
<folding>
<element signature="e#0#50#0" expanded="false" />
<element signature="e#0#44#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/CustomMessage/Item.jsx">
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/DateTimeStatusForm.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1500">
<caret line="100" column="38" selection-start-line="100" selection-start-column="30" selection-end-line="100" selection-end-column="38" />
<state relative-caret-position="192">
<caret line="44" column="58" selection-start-line="44" selection-start-column="8" selection-end-line="44" selection-end-column="58" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx">
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/ShouyiYongjingForm.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-573">
<caret line="20" column="14" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
<folding />
<state relative-caret-position="570">
<caret line="154" column="114" selection-start-line="154" selection-start-column="114" selection-end-line="154" selection-end-column="114" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/List.jsx">
<entry file="file://$PROJECT_DIR$/src/components/Layout/Layout.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1413">
<caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="13" selection-end-column="3" />
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#50#0" expanded="false" />
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/index.js">
<entry file="file://$PROJECT_DIR$/src/containers/App/App.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="17" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="17" />
<folding />
<state relative-caret-position="567">
<caret line="112" column="34" selection-start-line="112" selection-start-column="34" selection-end-line="112" selection-end-column="34" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/index.js">
<entry file="file://$PROJECT_DIR$/src/components/MainHeader/MainHeader.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="492">
<caret line="74" column="58" selection-start-line="74" selection-start-column="58" selection-end-line="74" selection-end-column="58" />
<state relative-caret-position="480">
<caret line="32" column="26" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/CopyToClipboard/CopyToClipboard.less">
<entry file="file://$PROJECT_DIR$/node_modules/antd/lib/table/Table.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="27" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
<state relative-caret-position="-1140">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/CopyToClipboard/CopyToClipboard.jsx">
<entry file="file://$PROJECT_DIR$/node_modules/antd/lib/table/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="267">
<caret line="49" column="12" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" />
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.less">
<entry file="file://$PROJECT_DIR$/node_modules/antd/lib/table/style/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="21" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<entry file="file://$PROJECT_DIR$/node_modules/antd/lib/style/components.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
......@@ -1312,186 +1466,166 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/DocumentsForm.jsx">
<entry file="file://$PROJECT_DIR$/node_modules/antd/lib/style/themes/default.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="79" column="16" selection-start-line="79" selection-start-column="16" selection-end-line="79" selection-end-column="16" />
<state relative-caret-position="15">
<caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="5" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/CustomMessage/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="91" column="82" selection-start-line="91" selection-start-column="8" selection-end-line="91" selection-end-column="82" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<entry file="file://$PROJECT_DIR$/src/containers/Remittance/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<state relative-caret-position="480">
<caret line="78" column="32" selection-start-line="78" selection-start-column="32" selection-end-line="78" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.jsx">
<entry file="file://$PROJECT_DIR$/src/variable.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="53" column="33" selection-start-line="53" selection-start-column="33" selection-end-line="53" selection-end-column="33" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
<state relative-caret-position="90">
<caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/index.html">
<entry file="file://$PROJECT_DIR$/src/containers/Withdraw/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<state relative-caret-position="462">
<caret line="126" column="94" selection-start-line="126" selection-start-column="23" selection-end-line="126" selection-end-column="94" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/App/App.jsx">
<entry file="file://$PROJECT_DIR$/src/containers/CustomMessage/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="89" column="47" selection-start-line="89" selection-start-column="47" selection-end-line="89" selection-end-column="47" />
<state relative-caret-position="462">
<caret line="101" column="80" selection-start-line="101" selection-start-column="67" selection-end-line="101" selection-end-column="80" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Trade/List.jsx">
<entry file="file://$PROJECT_DIR$/src/containers/App/App.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="130" column="7" selection-start-line="130" selection-start-column="7" selection-end-line="130" selection-end-column="7" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
<state relative-caret-position="573">
<caret line="113" column="27" selection-start-line="113" selection-start-column="27" selection-end-line="113" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Trade/Item.jsx">
<entry file="file://$PROJECT_DIR$/src/components/Layout/Layout.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237">
<caret line="121" column="86" selection-start-line="121" selection-start-column="37" selection-end-line="121" selection-end-column="86" />
<state relative-caret-position="150">
<caret line="10" column="20" selection-start-line="10" selection-start-column="20" selection-end-line="10" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/MainHeader.jsx">
<entry file="file://$PROJECT_DIR$/src/components/MainHeader/MainHeader.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="35" column="42" selection-start-line="35" selection-start-column="42" selection-end-line="35" selection-end-column="42" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
<state relative-caret-position="45">
<caret line="3" column="16" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/App/App.less">
<entry file="file://$PROJECT_DIR$/src/containers/Trade/AddItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1647">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<state relative-caret-position="327">
<caret line="122" column="12" selection-start-line="122" selection-start-column="12" selection-end-line="124" selection-end-column="99" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/entries/index.js">
<entry file="file://$PROJECT_DIR$/src/containers/CustomMessage/AddItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="342">
<caret line="69" column="99" selection-start-line="67" selection-start-column="12" selection-end-line="69" selection-end-column="99" />
<folding>
<element signature="e#0#22#0" expanded="true" />
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/entries/index.less">
<entry file="file://$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
<folding />
<state relative-caret-position="162">
<caret line="53" column="33" selection-start-line="53" selection-start-column="33" selection-end-line="53" selection-end-column="33" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils.js">
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="447">
<caret line="142" column="33" selection-start-line="142" selection-start-column="13" selection-end-line="142" selection-end-column="33" />
<state relative-caret-position="297">
<caret line="138" column="10" selection-start-line="122" selection-start-column="8" selection-end-line="138" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Product/EditItem.jsx">
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="567">
<caret line="85" column="50" selection-start-line="85" selection-start-column="50" selection-end-line="85" selection-end-column="50" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Product/AddItem.jsx">
<entry file="file://$PROJECT_DIR$/src/entries/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="615">
<caret line="104" column="6" selection-start-line="100" selection-start-column="4" selection-end-line="104" selection-end-column="6" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
<state relative-caret-position="315">
<caret line="83" column="26" selection-start-line="83" selection-start-column="26" selection-end-line="83" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/reducers/product.js">
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="522">
<caret line="50" column="6" selection-start-line="50" selection-start-column="6" selection-end-line="50" selection-end-column="6" />
<state relative-caret-position="375">
<caret line="104" column="21" selection-start-line="104" selection-start-column="21" selection-end-line="104" selection-end-column="21" />
<folding>
<element signature="e#0#44#0" expanded="true" />
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx">
<entry file="file://$PROJECT_DIR$/src/containers/Product/Product.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="94" column="8" selection-start-line="94" selection-start-column="8" selection-end-line="94" selection-end-column="81" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
<state relative-caret-position="420">
<caret line="28" column="38" selection-start-line="28" selection-start-column="38" selection-end-line="28" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/DateTimeStatusForm.jsx">
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/AddItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192">
<caret line="44" column="58" selection-start-line="44" selection-start-column="8" selection-end-line="44" selection-end-column="58" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
<state relative-caret-position="492">
<caret line="65" column="10" selection-start-line="50" selection-start-column="8" selection-end-line="65" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Product/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="165" column="34" selection-start-line="165" selection-start-column="34" selection-end-line="165" selection-end-column="34" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
<state relative-caret-position="30">
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="82" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/ShouyiYongjingForm.jsx">
<entry file="file://$PROJECT_DIR$/src/containers/Trade/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="154" column="114" selection-start-line="154" selection-start-column="114" selection-end-line="154" selection-end-column="114" />
<state relative-caret-position="495">
<caret line="84" column="14" selection-start-line="84" selection-start-column="14" selection-end-line="84" selection-end-column="14" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -4,8 +4,19 @@
flex-direction: column;
height: 100%;
overflow: hidden;
align-items: center;
& > .content {
flex: 1;
overflow: auto;
width: 100%;
& > div {
height: 100%;
& > :global(.ant-spin-container) {
height: 100%;
& > :global(.ant-form-horizontal) {
height: 100%;
}
}
}
}
}
......@@ -17,27 +17,24 @@ export default class MainHeader extends Component {
const {breadcrumb, title, operation} = this.props;
const styles = require('./MainHeader.less');
return (
<div className="main-header">
<Row >
<Col span="8">
<div className={styles.MainHeader}>
<Row className={styles.header} type="flex" justify="space-around" align="middle">
<Col span="16" style={{paddingLeft: 20}}>
<h1>{title}</h1>
<Breadcrumb>
{ breadcrumb.map((b, i)=><Breadcrumb.Item key={i}>{b}</Breadcrumb.Item>) }
</Breadcrumb>
</Col>
</Row>
<Row type="flex" justify="space-around" align="middle">
<Col span="20">
<h1 className="tac">{title}</h1>
<Col span="8">
{operation}
</Col>
{
operation &&
<Col span="4">
{operation}
</Col>
}
</Row>
{ this.props.children }
</div>
);
}
}
@import "../../variable";
.MainHeader {
width: 100%;
& > .header {
.borderBottom;
padding-bottom: 5px;
& > div {
&:first-child {
padding-left: 20px;
}
&:last-child {
padding-right: 20px;
}
}
h1 {
font-size: 18px;
margin-top: 5px;
}
:global {
.ant-breadcrumb {
color: #ccc;
font-weight: 300;
& > span:last-child {
color: #aaa;
}
}
}
}
& > :global(.filterForm) {
padding: 10px 20px;
.borderBottom;
}
}
......@@ -21,7 +21,7 @@ import {
} from 'antd';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
import {formItemLayout, footerFormSubmitLayout} from '../../utils';
......@@ -48,17 +48,32 @@ export default class AddItem extends Component {
render = ()=> {
const {loading, form:{getFieldProps}, location:{query}} = this.props;
const header = (<MainHeader breadcrumb={['产品管理', '产品详情', '添加公告']}
title={(query.title ? query.title + ' - ' : '') + '添加公告'}/>);
const operation = (
<div style={{textAlign:'right'}}>
<Button.Group>
<Button type="ghost" onClick={e=>{e.preventDefault(); this.props.history.goBack();}}>
<Icon type="rollback"/>
</Button>
</Button.Group>
</div>
);
const header = (
<MainHeader breadcrumb={['产品管理', '产品详情', '添加公告']}
title={(query.title ? query.title + ' - ' : '') + '添加公告'}
operation={operation}
/>
);
return (
<Layout header={header}>
<Spin spinning={loading}>
<Form horizontal onSubmit={this.handleSubmit.bind(this)}>
<Form className="main-form" horizontal onSubmit={this.handleSubmit.bind(this)}>
<Form.Item label="标题" {...formItemLayout}>
<Input placeholder="公告标题" {...getFieldProps('title')} />
</Form.Item>
<Form.Item label="内容" {...formItemLayout}>
<Input placeholder="公告内容" type="textarea" autosize={{minRows:5, maxRows:20}} {...getFieldProps('announcement')} />
<Input placeholder="公告内容" type="textarea"
autosize={{minRows:5, maxRows:20}} {...getFieldProps('announcement')} />
</Form.Item>
<Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}>
<Button type="primary" htmlType="submit" loading={loading}><Icon type="save"/>创建</Button>
......
......@@ -21,7 +21,7 @@ import {
} from 'antd';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
import {formItemLayout, footerFormSubmitLayout} from '../../utils';
......@@ -61,15 +61,29 @@ export default class EditItem extends Component {
render() {
const {announcement, loading, form:{getFieldProps}, location:{query}} = this.props;
const header = (<MainHeader breadcrumb={['产品管理', '产品详情', '修改公告']}
title={(query && query.title ? query.title + ' - ' : '') + '修改公告'}/>);
const operation = (
<div style={{textAlign:'right'}}>
<Button.Group>
<Button type="ghost" onClick={e=>{e.preventDefault(); this.props.history.goBack();}}>
<Icon type="rollback"/>
</Button>
</Button.Group>
</div>
);
const header = (
<MainHeader breadcrumb={['产品管理', '产品详情', '修改公告']}
title={(query && query.title ? query.title + ' - ' : '') + '修改公告'}
operation={operation}
/>
);
return (
<Layout header={header}>
<Spin spinning={loading}>
{
announcement &&
<Form horizontal onSubmit={this.handleSubmit.bind(this)}>
<Form className="main-form" horizontal onSubmit={this.handleSubmit.bind(this)}>
<Form.Item label="标题" {...formItemLayout}>
<Input placeholder="公告标题"
{...getFieldProps('title', {
......
......@@ -4,7 +4,7 @@ import {Table, Icon, Button, Switch, Form} from 'antd';
import {serialize, formatDateTime, productStatusToString, footerFormSubmitLayout} from '../../utils';
import {Link} from 'react-router';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
@connect(state=>({
......@@ -16,7 +16,9 @@ export default class List extends Component {
constructor(props, context) {
super(props, context);
this.state = {
filterVisible: false
}
}
componentDidMount() {
......@@ -34,6 +36,9 @@ export default class List extends Component {
this.props.history.push('/announcement/' + id + '/edit');
}
handleFilterVisible() {
}
render() {
......@@ -69,13 +74,15 @@ export default class List extends Component {
title: '标题',
dataIndex: 'title',
key: 'title',
width: 200,
}, {
title: '内容',
dataIndex: 'announcement',
key: 'announcement',
width: 200,
render: (announcement, record)=>(
<span title={announcement}>
{announcement && (announcement.length > 20 ? announcement.substr(0,20)+'...' : announcement)}
{announcement && (announcement.length > 20 ? announcement.substr(0, 20) + '...' : announcement)}
</span>
)
}, {
......@@ -113,32 +120,67 @@ export default class List extends Component {
}
];
const header = (<MainHeader breadcrumb={['产品管理', '产品详情', '公告列表']}
title={(query.title ? query.title + ' - ' : '') + '公告列表'}/>);
return (
<Layout header={header}>
<Form horizontal>
<Table className="ant-table" columns={columns}
dataSource={Array.isArray(items)?items:[]}
loading={loading}
pagination={pagination}
onRowClick={this.handleRowClick.bind(this)}
/>
<Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}>
const operation = (
<div style={{textAlign:'right'}}>
<Button.Group>
<Button type="ghost">
<Link to={'/announcement/create?itemId='+ query.itemId + '&title='+ query.title}>
<Button size="large"><Icon type="plus"/>添加</Button>
<Icon type="plus"/>
</Link>
<Button onClick={e=>{e.preventDefault(); this.props.history.goBack();}}
style={{marginLeft:'1em'}}>
<Icon type="rollback"/>返回
</Button>
</Form.Item>
</Form>
</Button>
<Button type="ghost" onClick={this.handleFilterVisible.bind(this)}>
<Icon type="filter"/>
</Button>
<Button type="ghost" onClick={e=>{e.preventDefault(); this.props.history.goBack();}}>
<Icon type="rollback"/>
</Button>
</Button.Group>
</div>
);
const header = (
<MainHeader breadcrumb={['产品管理', '产品详情', '公告列表']}
title={(query.title ? query.title + ' - ' : '') + '公告列表'}
operation={operation}
/>
);
const footer = (
<div style={{margin:'10px 0'}}>
<Link to={'/announcement/create?itemId='+ query.itemId + '&title='+ query.title}>
<Button type="primary">
<Icon type="plus"/>添加
</Button>
</Link>
<Button style={{margin:'0 1em'}} type="ghost" onClick={e=>{e.preventDefault(); this.props.history.goBack();}}>
<Icon type="rollback"/>返回
</Button>
</div>
);
return (
<Layout header={header} >
<Table className="list-table" columns={columns}
dataSource={Array.isArray(items)?items:[]}
loading={loading}
pagination={pagination}
scroll={{ y: window.innerHeight-(this.state.filterVisible? 203 :150) }}
onRowClick={this.handleRowClick.bind(this)}
/>
</Layout>
);
}
}
// <Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}>
// <Link to={'/announcement/create?itemId='+ query.itemId + '&title='+ query.title}>
// <Button size="large"><Icon type="plus"/>添加</Button>
// </Link>
// <Button onClick={e=>{e.preventDefault(); this.props.history.goBack();}}
// style={{marginLeft:'1em'}}>
// <Icon type="rollback"/>返回
// </Button>
// </Form.Item>
......@@ -79,22 +79,12 @@ export default class App extends Component {
const logo = require('./images/logo.png');
return (
<div className={styles.normal}>
<div className={styles.head}>
<Row type="flex" justify="space-around" align="middle">
<Col span="12">
<img className="page-logo" src={'/'+logo} title="枢纽科技" alt="枢纽科技"/>
</Col>
<Col span="12">
<div style={{float:'right', marginRight:30}}>
{user.username}
</div>
</Col>
</Row>
</div>
<div className={styles.content}>
<div className={styles.side}>
<div className={styles.content}>
<div className={styles.side}>
<header>
<img className="page-logo" src={'/'+logo} title="枢纽科技" alt="枢纽科技"/>
</header>
<section>
<Menu mode="inline" defaultOpenKeys={['sub1']}>
<SubMenu key="sub1" title={<span><Icon type="mail" /><span>业务管理</span></span>}>
{
......@@ -118,13 +108,13 @@ export default class App extends Component {
</Menu.Item>
</SubMenu>
</Menu>
</div>
<div className={styles.main}>
{user && user.token && this.props.children}
</div>
</section>
<footer>
杭州枢纽科技有限公司
</footer>
</div>
<div className={styles.foot}>
杭州枢纽科技有限公司 荣誉出品 <a href="mailto:bainx@vip.qq.com">问题反馈</a>
<div className={styles.main}>
{user && user.token && this.props.children}
</div>
</div>
);
......@@ -152,17 +142,25 @@ class MenuItemContent extends Component {
}
// <div className={styles.head}>
// <Row type="flex" justify="space-around" align="middle" style={{height:'100%'}}>
// <Col span="12">
// <img className="page-logo" src={'/'+logo} title="枢纽科技" alt="枢纽科技"/>
// </Col>
// <Col span="12">
// <div style={{float:'right', marginRight:30}}>
// {user.username}
// </div>
// </Col>
// </Row>
// </div>
// <div className={styles.foot}>
// 杭州枢纽科技有限公司 荣誉出品 <a href="mailto:bainx@vip.qq.com">问题反馈</a>
// </div>
//<div className={styles.normal}></div>
......
@import '../../variable';
.normal {
.content {
flex: 1;
display: flex;
flex-direction: column;
height: 100%;
}
.head {
background: #fff;
height: 75px;
padding: 8px;
color: #364171;
border-bottom: 1px solid #e0e0e0;
:global {
.page-logo {
margin: 20px 0 0 30px;
.side {
min-width: 220px;
max-width: 300px;
color: #eee;
background-color: #4D394B;
display: flex;
flex-direction: column;
height: 100%;
& > header {
padding: 20px;
img {
margin: 0 auto;
display: block;
}
}
}
.content {
flex: 1;
display: flex;
background-color: #e9ecf3;
padding: 20px 30px 0;
}
& > footer {
text-align: center;
padding: 10px 0;
color: #aaa;
}
& > section {
flex: 1;
}
.side {
/**/
width: 250px;
//min-width: 250px;
//max-width: 300px;
background: #fff;
border-right: 1px solid #e9e9e9;
margin-right: 0px;
padding: 30px 0 0;
border-radius: 5px 0 0 5px;
:global {
.ant-menu {
background-color: transparent;
color: #fff;
}
.ant-menu-item > a {
color: #fff;
}
.ant-menu-item-group-title {
color: #aaa;
}
.ant-menu-inline,
.ant-menu-vertical {
border-right: 0;
}
.ant-menu-item:hover,
.ant-menu-item-active,
.ant-menu-submenu-active,
.ant-menu-submenu-title:hover {
background-color: @primary-color;
}
.ant-menu-inline .ant-menu-selected, .ant-menu-inline .ant-menu-item-selected {
border-right: 1px solid @primary-color;
background-color: @primary-color;
}
.ant-menu-vertical,
.ant-menu-inline,
.ant-menu-item-group-list {
& > .ant-menu-item,
& > .ant-menu-submenu > .ant-menu-submenu-title {
.cn {
font-size: 12px;
}
.en {
font-size: 10px;
margin-left: .5em;
opacity: .45;
font-style: italic;
font-weight: 300;
}
}
}
}
}
......@@ -49,100 +82,36 @@
display: flex;
flex-direction: column;
height: 100%;
padding: 10px 20px;
flex: 1 0 auto;
overflow: hidden;
background: #fff;
border-radius: 0 5px 5px 0;
h1 {
font-size: 24px;
color: #404040;
font-weight: 400;
line-height: 40px;
margin-bottom: 24px;
margin-top: 8px;
font-family: lato, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
font-size: 18px;
color: #444;
font-weight: 700;
line-height: 36px;
margin-top: 10px;
}
h2 {
font-size: 22px;
color: #505050;
font-weight: 400;
line-height: 36px;
font-size: 16px;
color: #666;
font-weight: 500;
line-height: 30px;
margin-top: 6px;
}
h3 {
font-size: 18px;
color: #606060;
font-size: 14px;
color: #888;
font-weight: 400;
line-height: 30px;
line-height: 26px;
margin-top: 2px;
}
//& > section {
// display: flex;
// flex-direction: column;
// height: 100%;
// overflow: auto;
// & > header {
// h1 {
// line-height: 30px;
// margin: 0;
// }
// :global {
// .ant-breadcrumb {
// & > span {
// line-height: 42px;
// }
// }
// }
// }
// & > * {
// &:nth-child(2){
// flex: 1;
// overflow: auto;
// display: flex;
// flex-direction: column;
// :global{
// .content{
// flex:1;
// }
// }
//
// }
// }
//}
:global {
.tac {
text-align: center !important;
}
.main-header {
border-bottom: 1px solid #eaeaea;
margin-bottom: 20px;
h1 {
margin-bottom: 10px;
}
}
}
}
.foot {
//background: #fafafa;
//border-top: 1px solid #e0e0e0;
padding: 8px;
font-size: 12px;
text-align: center;
a {
margin-left: .5em;
opacity: .8;
& > div {
height: 100%;
flex: 1 0 auto;
}
}
:global {
.img-priview-dialog {
.ant-modal-content {
background-color: transparent;
img {
margin: auto;
display: block;
}
:global {
.main-form {
padding-top: 24px;
}
}
}
......
......@@ -24,7 +24,7 @@ import {
import Copy from '../../components/CopyToClipboard/CopyToClipboard';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
import {
handleUpload
......
......@@ -21,7 +21,7 @@ import {
} from 'antd';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
import {formItemLayout, footerFormSubmitLayout} from '../../utils';
......@@ -33,8 +33,8 @@ export default class AddItem extends Component {
constructor(props, content) {
super(props, content);
this.state = {
redirectName: '请选择',
sendName: '请选择'
redirectName: undefined,
sendName: undefined
}
}
......@@ -55,16 +55,19 @@ export default class AddItem extends Component {
render = ()=> {
const {loading, form:{getFieldProps}, location:{query}} = this.props;
const header = (<MainHeader breadcrumb={['消息管理', '推送消息']}
title="推送消息"/>);
const header = (
<MainHeader breadcrumb={['消息管理', '推送消息']} title="推送消息"/>
);
const redirectNamePlaceholder = {0: '无需填写', 1: '请输入一个产品ID', 2: '请输入消息跳转指定的URL地址'};
const sendNamePlaceholder = {1: '无需填写', 2: '请输入一个产品ID', 3: '请输入接收消息的人员的手机号码'};
const redirectNamePlaceholder = {0:'无需填写', 1:'请输入一个产品ID', 2:'请输入消息跳转指定的URL地址'};
const sendNamePlaceholder = {1:'无需填写', 2:'请输入一个产品ID', 3:'请输入接收消息的人员的手机号码'};
return (
<Layout header={header}>
<Spin spinning={loading}>
<Form horizontal onSubmit={this.handleSubmit.bind(this)}>
<Form className="main-form" horizontal onSubmit={this.handleSubmit.bind(this)}>
<Form.Item label="推送渠道" {...formItemLayout}>
<Row>
<Col span="6">
......
......@@ -9,7 +9,7 @@ import {
} from '../../utils';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
@connect(state=>({
loading: state.customMessage.loading,
......
......@@ -4,7 +4,7 @@ import {Table, Icon, Button, Switch, Form} from 'antd';
import {serialize, formatDateTime, productStatusToString, footerFormSubmitLayout} from '../../utils';
import {Link} from 'react-router';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
@connect(state=>({
......@@ -16,7 +16,9 @@ export default class List extends Component {
constructor(props, context) {
super(props, context);
this.state = {
filterVisible: false
}
}
componentDidMount() {
......@@ -93,11 +95,11 @@ export default class List extends Component {
return (
<Layout header={header}>
<Table className="ant-table" columns={columns}
<Table className="list-table" columns={columns}
dataSource={Array.isArray(items)?items:[]}
loading={loading}
pagination={pagination}
scroll={{ y: window.innerHeight-380 }}
scroll={{ y: window.innerHeight-(this.state.filterVisible? 203 :150) }}
onRowClick={this.handleRowClick.bind(this)}
/>
</Layout>
......
......@@ -27,7 +27,7 @@ import ElementForm from '../../components/ProductForm/ElementForm';
import DateTimeStatusForm from '../../components/ProductForm/DateTimeStatusForm';
import DocumentsForm from '../../components/ProductForm/DocumentsForm';
import ContactForm from '../../components/ProductForm/ContactForm';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
import Layout from '../../components/Layout/Layout';
......
......@@ -28,7 +28,7 @@ import ElementForm from '../../components/ProductForm/ElementForm';
import DateTimeStatusForm from '../../components/ProductForm/DateTimeStatusForm';
import DocumentsForm from '../../components/ProductForm/DocumentsForm';
import ContactForm from '../../components/ProductForm/ContactForm';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
import Layout from '../../components/Layout/Layout';
@connect(state=>({
......
......@@ -17,7 +17,7 @@ import {
import {Link} from 'react-router';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
const ProductStatus = Object.keys(PRODUCT_STATUS).filter(key=>key != -9);
......@@ -147,13 +147,13 @@ export default class List extends Component {
this.fetchList(searchQuery);
}
handleResetFilterForm(e){
handleResetFilterForm(e) {
e.preventDefault();
this.props.form.setFieldsValue({
id:undefined,
id: undefined,
status: undefined,
categoryId:undefined,
title:undefined
categoryId: undefined,
title: undefined
});
}
......@@ -189,9 +189,11 @@ export default class List extends Component {
const operation = (
<div style={{textAlign:'right'}}>
<Button size="small" type="ghost" onClick={this.handleFilterVisible.bind(this)}>
<Icon type="filter"/>
</Button>
<Button.Group>
<Button type="ghost" onClick={this.handleFilterVisible.bind(this)}>
<Icon type="filter"/>
</Button>
</Button.Group>
</div>
);
......@@ -199,17 +201,15 @@ export default class List extends Component {
size: 'default',
style: {width: 100}
}
//horizontal
const header = (
<div>
<MainHeader breadcrumb={['产品管理', '产品列表']}
title="产品列表"
operation={operation}
/>
<MainHeader breadcrumb={['产品管理', '产品列表']}
title="产品列表"
operation={operation}
>
{
this.state.filterVisible &&
<Form inline onSubmit={this.handleFilterSubmit.bind(this)} style={{marginBottom:20}}
className="tac">
<Form className="filterForm" inline onSubmit={this.handleFilterSubmit.bind(this)}>
<Form.Item label="ID">
<Input placeholder="请输入搜索ID" {...searchStyle} {...getFieldProps('id')}/>
</Form.Item>
......@@ -247,7 +247,7 @@ export default class List extends Component {
</Form.Item>
</Form>
}
</div>
</MainHeader>
);
return (
......@@ -256,7 +256,7 @@ export default class List extends Component {
dataSource={Array.isArray(items)?items:[]}
loading={loading}
pagination={pagination}
scroll={{ y: window.innerHeight-(this.state.filterVisible? 432 :380) }}
scroll={{ y: window.innerHeight-(this.state.filterVisible? 203 :150) }}
onRowClick={this.handleRowClick.bind(this)}
/>
</Layout>
......
......@@ -19,13 +19,20 @@
.tablist {
}
//.ant-tabs-vertical.ant-tabs-left > .ant-tabs-content {
// padding-left: 5px;
// padding-top: 24px;
//}
.ant-tabs-content {
flex: 1;
height: 100%;
padding-left:0 !important;
.ant-tabs-tabpane {
height: 100%;
overflow: auto;
padding-top:24px;
}
}
}
}
......@@ -4,7 +4,7 @@ import {Table, Icon} from 'antd';
import {Link} from 'react-router';
import {serialize, formatDateTime, remittanceAuditStatusToString} from '../../utils';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
const columns = [
{
......@@ -75,7 +75,9 @@ export default class List extends Component {
constructor(props, context) {
super(props, context);
this.state = {
filterVisible: false
}
}
componentDidMount() {
......@@ -122,11 +124,11 @@ export default class List extends Component {
return (
<Layout header={header}>
<Table className="ant-table" columns={columns}
<Table className="list-table" columns={columns}
dataSource={Array.isArray(items) ? items : []}
loading={loading}
pagination={pagination}
scroll={{y: window.innerHeight - 380}}
scroll={{ y: window.innerHeight-(this.state.filterVisible? 203 :150) }}
onRowClick={this.handleRowClick.bind(this)}
/>
</Layout>
......
......@@ -21,7 +21,7 @@ import {
} from 'antd';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
import {
formatDateTime,
......
......@@ -18,7 +18,7 @@ import {
} from 'antd';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
import {
formatDateTime,
......@@ -122,7 +122,7 @@ export default class AddItem extends Component {
return (
<Layout header={header}>
<Spin spinning={loading}>
<Form horizontal onSubmit={this.handleSubmit.bind(this)} style={{height:'100%'}}>
<Form className="main-form" horizontal onSubmit={this.handleSubmit.bind(this)}>
<Form.Item {...smallFormItemLayout} label="理财师手机号" help="请准确核对理财师手机号码">
<Input {...getFieldProps('user.mobile')} />
</Form.Item>
......@@ -160,7 +160,7 @@ export default class AddItem extends Component {
{...getFieldProps('remittance.remittanceTime')}
/>
</Form.Item>
<Form.Item {...formItemLayout} label="投资人银行卡开户行">
<Form.Item {...smallFormItemLayout} label="投资人银行卡开户行">
<Input placeholder="中国工商银行杭州文一西路支行" {...getFieldProps('remittance.bankBranch')} />
</Form.Item>
<Form.Item {...formItemLayout} label="投资人银行卡照片">
......
......@@ -29,7 +29,7 @@ import {
} from '../../utils';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
@connect(state=>({
item: state.trade.item,
......
......@@ -29,7 +29,7 @@ import {
} from '../../utils';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
@connect(state=>({
loading: state.contract.loading,
......
......@@ -9,7 +9,7 @@ import {
} from '../../utils';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
@connect(state=>({
loading: state.trade.loading,
......
import React, {Component, PropTypes} from 'react';
import {connect} from 'react-redux';
import {Table, Icon, Breadcrumb, Row, Col, Input} from 'antd';
import {Table, Icon, Row, Col, Button, Form, Input, Cascader, Select} from 'antd';
import {Link} from 'react-router';
import {serialize, formatDateTime, tradeStatusToString} from '../../utils';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
const columns = [
{
......@@ -82,11 +82,14 @@ const columns = [
loading: state.trade.loading,
total: state.trade.total,
}))
@Form.create()
export default class List extends Component {
constructor(props, context) {
super(props, context);
this.state = {
filterVisible: false,
}
}
componentWillMount() {
......@@ -104,9 +107,45 @@ export default class List extends Component {
this.props.history.push('/trades/' + id);
}
handleFilterVisible() {
this.setState({
filterVisible: !this.state.filterVisible
});
}
handleFilterSubmit(e) {
e.preventDefault();
// const formData = this.props.form.getFieldsValue();
// if (formData.categoryId && formData.categoryId[1]) {
// formData.categoryId = formData.categoryId[1];
// }
// const searchQuery = {...this.props.location.query, ...formData};
// console.log(searchQuery);
// this.props.history.replace(this.props.location.pathname + '?' + serialize(searchQuery));
// this.fetchList(searchQuery);
}
handleResetFilterForm(e) {
e.preventDefault();
// this.props.form.setFieldsValue({
// id: undefined,
// status: undefined,
// categoryId: undefined,
// title: undefined
// });
}
render() {
const {total, items, loading, history:{replace}, location:{pathname, query}} = this.props;
const {
total,
items,
loading,
history:{replace},
form:{getFieldProps},
location:{pathname, query}
} = this.props;
const pagination = {
total: total,
......@@ -128,18 +167,66 @@ export default class List extends Component {
}
};
const operation = (
<div style={{textAlign:'right'}}>
<Button.Group>
<Button type="ghost" onClick={this.handleFilterVisible.bind(this)}>
<Icon type="filter"/>
</Button>
</Button.Group>
</div>
);
const header = (<MainHeader breadcrumb={['订单管理', '订单列表']}
title="订单列表"/>);
const header = (
<MainHeader breadcrumb={['订单管理', '订单列表']}
operation={operation}
title="订单列表">
{
this.state.filterVisible &&
<Form className="filterForm" inline onSubmit={this.handleFilterSubmit.bind(this)}>
<Form.Item label="ID">
<Input placeholder="请输入搜索ID" {...searchStyle} {...getFieldProps('id')}/>
</Form.Item>
<Form.Item label="类目">
{
cates &&
<Cascader options={cates} placeholder="请选产品类目" {...searchStyle}
{...getFieldProps('categoryId')}
/>
}
</Form.Item>
<Form.Item label="标题">
<Input placeholder="请输入搜索标题" {...searchStyle} {...getFieldProps('title')}/>
</Form.Item>
<Form.Item label="状态">
<Select placeholder="请选择状态" {...searchStyle} {...getFieldProps('status')}>
<Select.Option key="status-option-default"
value={null}>请选择</Select.Option>
</Select>
</Form.Item>
<Form.Item>
<Button.Group size="default">
<Button type="primary" size="default" htmlType="submit" loading={loading}><Icon
type="search"/>筛选</Button>
<Button type="ghost" size="default" htmlType="reset"
onClick={this.handleResetFilterForm.bind(this)}><Icon
type="cross-circle-o"/>清空</Button>
</Button.Group>
</Form.Item>
</Form>
}
</MainHeader>
);
return (
<Layout header={header}>
<Table className="ant-table" columns={columns}
<Table className="list-table" columns={columns}
dataSource={Array.isArray(items)?items:[]}
loading={loading}
pagination={pagination}
scroll={{ y: window.innerHeight-380 }}
scroll={{ y: window.innerHeight-(this.state.filterVisible? 203 :150) }}
onRowClick={this.handleRowClick.bind(this)}
/>
</Layout>
......
......@@ -5,7 +5,7 @@ import {Link} from 'react-router';
import {serialize, formatDateTime, remittanceAuditStatusToString} from '../../utils';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
const columns = [
{
......@@ -17,6 +17,7 @@ const columns = [
title: '提款人',
dataIndex: 'bankCard',
key: 'bankCard',
width:150,
render: (bankCard, record)=>(<span>{bankCard.userName}</span>)
}, {
title: '提现金额',
......@@ -69,6 +70,9 @@ export default class List extends Component {
constructor(props, context) {
super(props, context);
this.state = {
filterVisible: false
}
}
......@@ -116,11 +120,11 @@ export default class List extends Component {
return (
<Layout header={header}>
<Table className="ant-table" columns={columns}
<Table className="list-table" columns={columns}
dataSource={Array.isArray(items) ? items : []}
loading={loading}
pagination={pagination}
scroll={{y: window.innerHeight - 380}}
scroll={{ y: window.innerHeight-(this.state.filterVisible? 203 :150) }}
onRowClick={this.handleRowClick.bind(this)}
/>
</Layout>
......
......@@ -21,7 +21,7 @@ import {
} from 'antd';
import Layout from '../../components/Layout/Layout';
import MainHeader from '../../components/MainHeader';
import MainHeader from '../../components/MainHeader/MainHeader';
import {
formatDateTime,
......
@import '../variable';
:global {
html, body, #root {
height: 100vh !important;
height: 100%;
font-size: 14px;
background-color: #e9ecf3;
}
//input[type="text"][readonly],
//textarea[readonly]{
// background-color: #fafafa !important;
//}
//.ant-cascader-input[type="text"][readonly]{
// background-color: #fff !important;
//}
label,
.ant-form-item {
font-size: 14px !important;
.ant-form-explain {
font-size: 12px;
}
}
.ant-btn {
font-weight: 400 !important;
}
.ant-table{
font-size: 14px !important;
}
.list-table {
#root {
display: flex;
flex-direction: column;
height: 100%;
overflow: hidden;
& > div {
&:first-child {
flex: 1
.ant-btn,
.ant-btn-ghost,
.ant-pagination-item,
.ant-pagination-prev,
.ant-pagination-next {
&:focus,
&:hover {
color: @primary-color;
border-color: @primary-color;
}
}
.ant-btn-primary,
.ant-pagination-item-active {
background-color: @primary-color;
border-color: @primary-color;
&:hover {
color: #fff;
}
}
}
.ant-menu-vertical,
.ant-menu-inline,
.ant-menu-item-group-list {
& > .ant-menu-item,
& > .ant-menu-submenu > .ant-menu-submenu-title {
.cn {
font-size: 14px;
.ant-input,
.ant-select-selection {
&:focus,
&:hover {
border-color: @primary-color;
}
&:focus {
box-shadow: 0 0 0 2px rgba(76, 150, 137, 0.2);
}
.en {
font-size: 10px;
margin-left: .5em;
opacity: .45;
font-style: italic;
font-weight: 300;
}
.ant-btn-group {
.ant-btn-primary {
&:last-child:not(:first-child),
& + .ant-btn {
border-left-color: @primary-color;
}
}
}
.ant-pagination-prev:hover,
.ant-pagination-next:hover,
.ant-pagination-item:hover {
a {
color: @primary-color;
}
}
.ant-pagination-item-active:hover {
a {
color: #fff;
}
}
.ant-pagination-disabled:hover {
border-color: #d9d9d9;
a {
color: #ccc;
}
}
.ant-table {
th, td {
padding: 10px 5px;
}
}
.ant-form-item-with-help {
margin-bottom: 10px;
}
.ant-tabs-vertical {
.ant-tabs-nav {
padding-top: 14px;
}
}
.ant-tabs-vertical > .ant-tabs-bar .ant-tabs-tab {
margin: 5px 0;
}
.list-table {
display: flex;
flex-direction: column;
height: 100%;
overflow: hidden;
align-items: center;
.ant-table-header,
.ant-table {
&, table {
border-radius: 0;
}
}
.ant-table {
th, td {
&:first-child {
padding-left: 20px;
}
&:last-child {
padding-right: 20px;
}
}
th {
background-color: #eee;
.borderBottom;
}
tr {
&:nth-child(2n) {
background-color: #fcfcfc;
}
}
}
& > div {
&:first-child {
flex: 1;
width: 100%;
}
}
.ant-table-pagination {
margin: 10px 0;
}
}
.tac {
text-align: center !important;
}
.img-priview-dialog {
.ant-modal-content {
background-color: transparent;
img {
margin: auto;
display: block;
}
}
}
}
}
@primary-color : #4c9689;
@info-color : #4c9689;
@success-color : #87d068;
@error-color : #f50;
@warning-color : #fa0;
.borderBottom() {
border-bottom: 1px solid #e2e2e2;
}
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 to comment