Skip to content

S
shuniu-admin-react
Commit 1fbbabc6 authored by superman's avatar superman
Browse files
Options

update

parent 40acf81d
Hide whitespace changes
Inline Side-by-side
Showing with 450 additions and 277 deletions
.idea/workspace.xml
View file @ 1fbbabc6
...@@ -2,16 +2,9 @@ ...@@ -2,16 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ec208c71-5ff8-4642-a786-fad4f24be9b8" name="Default" comment=""> <list default="true" id="ec208c71-5ff8-4642-a786-fad4f24be9b8" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/const.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/proxy.config.js" afterPath="$PROJECT_DIR$/proxy.config.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/proxy.config.js" afterPath="$PROJECT_DIR$/proxy.config.js" />
<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/Withdraw/PassItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Withdraw/PassItem.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/BaseFunction/BaseUpload.jsx" afterPath="$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.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/reducers/announcement.js" afterPath="$PROJECT_DIR$/src/reducers/announcement.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/sagas/announcement.js" afterPath="$PROJECT_DIR$/src/sagas/announcement.js" />
</list> </list>
<ignored path="shuniu-admin.iws" /> <ignored path="shuniu-admin.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -34,112 +27,118 @@ ...@@ -34,112 +27,118 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="AddItem.jsx" pinned="false" current-in-tab="false"> <file leaf-file-name="product.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Trade/AddItem.jsx"> <entry file="file://$PROJECT_DIR$/src/services/product.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345"> <state relative-caret-position="0">
<caret line="58" column="5" selection-start-line="51" selection-start-column="4" selection-end-line="58" selection-end-column="5" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#50#0" expanded="true" /> <element signature="e#0#30#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="AddItem.jsx" pinned="false" current-in-tab="false"> <file leaf-file-name="customMessage.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/AddItem.jsx"> <entry file="file://$PROJECT_DIR$/src/services/customMessage.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-150"> <state relative-caret-position="0">
<caret line="42" column="15" selection-start-line="42" selection-start-column="15" selection-end-line="42" selection-end-column="15" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="EditItem.jsx" pinned="false" current-in-tab="false"> <file leaf-file-name="contract.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx"> <entry file="file://$PROJECT_DIR$/src/services/contract.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405"> <state relative-caret-position="0">
<caret line="133" column="65" selection-start-line="133" selection-start-column="65" selection-end-line="133" selection-end-column="65" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="announcement.js" pinned="false" current-in-tab="false"> <file leaf-file-name="announcement.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/sagas/announcement.js"> <entry file="file://$PROJECT_DIR$/src/services/announcement.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133"> <state relative-caret-position="0">
<caret line="9" column="50" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="50" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#38#0" expanded="true" /> <element signature="e#0#30#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="const.js" pinned="false" current-in-tab="true"> <file leaf-file-name="proxy.config.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/const.js"> <entry file="file://$PROJECT_DIR$/proxy.config.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="75">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="6" column="2" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="contract.js" pinned="false" current-in-tab="false"> <file leaf-file-name="remittance.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/sagas/contract.js"> <entry file="file://$PROJECT_DIR$/src/services/remittance.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-240"> <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" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#38#0" expanded="true" /> <element signature="e#0#30#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="customMessage.js" pinned="false" current-in-tab="false"> <file leaf-file-name="withdraw.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/sagas/customMessage.js"> <entry file="file://$PROJECT_DIR$/src/services/withdraw.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="0">
<caret line="19" column="11" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#38#0" expanded="true" /> <element signature="e#0#30#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="proxy.config.js" pinned="false" current-in-tab="false"> <file leaf-file-name="PassItem.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/proxy.config.js"> <entry file="file://$PROJECT_DIR$/src/containers/Withdraw/PassItem.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="357">
<caret line="6" column="2" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" /> <caret line="213" column="78" selection-start-line="213" selection-start-column="78" selection-end-line="213" selection-end-column="78" />
<folding /> <folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="BaseUpload.jsx" pinned="false" current-in-tab="false"> <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.jsx"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="60">
<caret line="52" column="52" selection-start-line="52" selection-start-column="52" selection-end-line="52" selection-end-column="52" /> <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding> <folding />
<element signature="e#0#50#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false"> <file leaf-file-name="PassItem.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/sagas/index.js"> <entry file="file://$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="72">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="78" column="8" selection-start-line="78" selection-start-column="8" selection-end-line="120" selection-end-column="112" />
<folding /> <folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -157,7 +156,6 @@ ...@@ -157,7 +156,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.less" />
<option value="$PROJECT_DIR$/src/components/MainHeader.jsx" /> <option value="$PROJECT_DIR$/src/components/MainHeader.jsx" />
<option value="$PROJECT_DIR$/src/containers/Remittance/List.jsx" /> <option value="$PROJECT_DIR$/src/containers/Remittance/List.jsx" />
<option value="$PROJECT_DIR$/src/variable.less" /> <option value="$PROJECT_DIR$/src/variable.less" />
...@@ -205,9 +203,10 @@ ...@@ -205,9 +203,10 @@
<option value="$PROJECT_DIR$/src/containers/Announcement/AddItem.jsx" /> <option value="$PROJECT_DIR$/src/containers/Announcement/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx" /> <option value="$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx" />
<option value="$PROJECT_DIR$/src/sagas/announcement.js" /> <option value="$PROJECT_DIR$/src/sagas/announcement.js" />
<option value="$PROJECT_DIR$/proxy.config.js" />
<option value="$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.jsx" /> <option value="$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.jsx" />
<option value="$PROJECT_DIR$/src/const.js" /> <option value="$PROJECT_DIR$/src/const.js" />
<option value="$PROJECT_DIR$/proxy.config.js" />
<option value="$PROJECT_DIR$/src/containers/Withdraw/PassItem.jsx" />
</list> </list>
</option> </option>
</component> </component>
...@@ -278,6 +277,86 @@ ...@@ -278,6 +277,86 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </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="services" />
<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>
<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="Withdraw" />
<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>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" /> <option name="myItemId" value="shuniu-admin" />
...@@ -769,12 +848,12 @@ ...@@ -769,12 +848,12 @@
<workItem from="1468394206076" duration="1879000" /> <workItem from="1468394206076" duration="1879000" />
<workItem from="1468396235889" duration="33823000" /> <workItem from="1468396235889" duration="33823000" />
<workItem from="1468540294765" duration="94258000" /> <workItem from="1468540294765" duration="94258000" />
<workItem from="1468995021353" duration="208176000" /> <workItem from="1468995021353" duration="212160000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="338136000" /> <option name="totallyTimeSpent" value="342120000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -787,7 +866,7 @@ ...@@ -787,7 +866,7 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1280" height="800" extended-state="0" /> <frame x="0" y="0" width="1280" height="800" extended-state="0" />
<editor active="true" /> <editor active="false" />
<layout> <layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329235" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329235" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
...@@ -797,7 +876,7 @@ ...@@ -797,7 +876,7 @@
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32739726" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32739726" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24071082" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24071082" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
...@@ -859,94 +938,6 @@ ...@@ -859,94 +938,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/reducers/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="59" column="81" selection-start-line="59" selection-start-column="81" selection-end-line="59" selection-end-column="81" />
<folding>
<element signature="e#0#44#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/App/App.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-732">
<caret line="31" column="23" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Users/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="55" column="5" selection-start-line="55" selection-start-column="5" selection-end-line="55" selection-end-column="5" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/MainHeader/MainHeader.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Layout/Layout.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="9" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/MainHeader/MainHeader.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="438">
<caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
<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="165">
<caret line="216" column="102" selection-start-line="216" selection-start-column="102" selection-end-line="216" selection-end-column="102" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237">
<caret line="58" column="36" selection-start-line="58" selection-start-column="36" selection-end-line="58" selection-end-column="36" />
<folding>
<element signature="e#0#50#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1398">
<caret line="35" column="54" selection-start-line="35" selection-start-column="54" selection-end-line="35" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Remittance/List.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="49" column="77" selection-start-line="49" selection-start-column="77" selection-end-line="49" selection-end-column="77" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/xFetch.js"> <entry file="file://$PROJECT_DIR$/src/services/xFetch.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345"> <state relative-caret-position="345">
...@@ -1049,16 +1040,6 @@ ...@@ -1049,16 +1040,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="225" column="111" selection-start-line="224" selection-start-column="68" selection-end-line="225" selection-end-column="111" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/HuikuanInfoForm.jsx"> <entry file="file://$PROJECT_DIR$/src/components/ProductForm/HuikuanInfoForm.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="507"> <state relative-caret-position="507">
...@@ -1173,7 +1154,7 @@ ...@@ -1173,7 +1154,7 @@
<state relative-caret-position="342"> <state relative-caret-position="342">
<caret line="125" column="45" selection-start-line="125" selection-start-column="19" selection-end-line="125" selection-end-column="45" /> <caret line="125" column="45" selection-start-line="125" selection-start-column="19" selection-end-line="125" selection-end-column="45" />
<folding> <folding>
<element signature="e#0#38#0" expanded="true" /> <element signature="e#0#38#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -1188,14 +1169,6 @@ ...@@ -1188,14 +1169,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Trade/List.jsx"> <entry file="file://$PROJECT_DIR$/src/containers/Trade/List.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360"> <state relative-caret-position="360">
...@@ -1267,7 +1240,7 @@ ...@@ -1267,7 +1240,7 @@
<state relative-caret-position="-240"> <state relative-caret-position="-240">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#38#0" expanded="true" /> <element signature="e#0#38#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -1277,7 +1250,7 @@ ...@@ -1277,7 +1250,7 @@
<state relative-caret-position="285"> <state relative-caret-position="285">
<caret line="19" column="11" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" /> <caret line="19" column="11" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" />
<folding> <folding>
<element signature="e#0#38#0" expanded="true" /> <element signature="e#0#38#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -1295,7 +1268,113 @@ ...@@ -1295,7 +1268,113 @@
<state relative-caret-position="133"> <state relative-caret-position="133">
<caret line="9" column="50" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="50" /> <caret line="9" column="50" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="50" />
<folding> <folding>
<element signature="e#0#38#0" expanded="true" /> <element signature="e#0#38#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<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="52" column="52" selection-start-line="52" selection-start-column="52" selection-end-line="52" selection-end-column="52" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/const.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/user.js">
<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" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/trade.js">
<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" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/todos.js">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/remittance.js">
<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" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/product.js">
<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" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/customMessage.js">
<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" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/contract.js">
<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" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/announcement.js">
<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" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/withdraw.js">
<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" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -1308,20 +1387,30 @@ ...@@ -1308,20 +1387,30 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.jsx"> <entry file="file://$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="72">
<caret line="52" column="52" selection-start-line="52" selection-start-column="52" selection-end-line="52" selection-end-column="52" /> <caret line="78" column="8" selection-start-line="78" selection-start-column="8" selection-end-line="120" selection-end-column="112" />
<folding> <folding>
<element signature="e#0#50#0" expanded="true" /> <element signature="e#0#50#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/const.js"> <entry file="file://$PROJECT_DIR$/src/containers/Withdraw/PassItem.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="357">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="213" column="78" selection-start-line="213" selection-start-column="78" selection-end-line="213" selection-end-column="78" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
dist/index.js
View file @ 1fbbabc6
This source diff could not be displayed because it is too large. You can view the blob instead.
proxy.config.js
View file @ 1fbbabc6
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
// - https://github.com/dora-js/dora-plugin-proxy#规则定义 // - https://github.com/dora-js/dora-plugin-proxy#规则定义
module.exports = { module.exports = {
// '/api/*': 'http://react.yanky.cn/', '/api/*': 'http://react.yanky.cn/',
'/api/*': 'http://192.168.1.126:8080/' // '/api/*': 'http://192.168.1.126:8080/'
}; };
src/containers/Withdraw/PassItem.jsx
View file @ 1fbbabc6
...@@ -28,7 +28,8 @@ import { ...@@ -28,7 +28,8 @@ import {
formItemLayout, formItemLayout,
smallFormItemLayout, smallFormItemLayout,
footerFormSubmitLayout, footerFormSubmitLayout,
remittanceAuditStatusToString remittanceAuditStatusToString,
NULL
} from '../../utils'; } from '../../utils';
@connect(state=>({ @connect(state=>({
...@@ -39,6 +40,9 @@ import { ...@@ -39,6 +40,9 @@ import {
export default class PassItem extends Component { export default class PassItem extends Component {
constructor() { constructor() {
super(...arguments); super(...arguments);
this.state = {
isEdit: false
}
} }
...@@ -70,16 +74,70 @@ export default class PassItem extends Component { ...@@ -70,16 +74,70 @@ export default class PassItem extends Component {
render() { render() {
const {audit, loading, form:{getFieldProps}, location:{query}} = this.props; const {audit, loading, form:{getFieldProps}, location:{query}} = this.props;
//
// const {isEdit} = this.state;
//
// let title = (audit && audit.nickname ? audit.nickname + ' - ' : '');
//
// let readOnly = true;
//
// if (audit) {
// switch (audit.status) {
// case 1:
// title += '提现审核详情';
// readOnly = false;
// break;
// case 5:
// title += '审核失败';
// break;
// case 9:
// title += '审核成功';
// }
// } else {
// title += '提现审核详情';
// }
//
// const header = (<MainHeader breadcrumb={['审核管理', '提现审核','审核详情']} title={title}/>);
//
// let memo = [];
//
// if (audit) {
// if (audit.status == 1) {
// const {bankCard, balance, balanceLong, amountLong} = audit;
// if (!balance) {
// memo.push('无余额可用');
// } else if (balanceLong < amountLong) {
// memo.push('余额不足');
// }
//
// const {username, bank, bankBranch, num} = bankCard;
//
// if (!username) {
// memo.push('无持卡人信息');
// }
// if (!num) {
// memo.push('无银行卡号');
// }
// if (!bank || !bankBranch) {
// memo.push('无开户行信息');
// }
// } else {
// memo.push(audit.memo);
// }
// }
//
// memo = memo.length && memo[0] || '';
let title = (audit && audit.nickname ? audit.nickname + ' - ' : ''); let title = (audit && audit.nickname ? audit.nickname + ' - ' : '');
let readOnly = true; const isEdit = audit && audit.status == 1 && this.state.isEdit;
if (audit) { if (audit) {
switch (audit.status) { switch (audit.status) {
case 1: case 1:
title += '报单审核详情'; title += '报单审核详情';
readOnly = false;
break; break;
case 5: case 5:
title += '审核失败'; title += '审核失败';
...@@ -88,39 +146,32 @@ export default class PassItem extends Component { ...@@ -88,39 +146,32 @@ export default class PassItem extends Component {
title += '审核成功'; title += '审核成功';
} }
} else { } else {
title += '提现审核详情'; title += '报单审核详情';
} }
const header = (<MainHeader breadcrumb={['审核管理', '提现审核','审核详情']} title={title}/>); const operation = (
<div style={{textAlign:'right'}}>
let memo = []; <Button.Group>
{
if (audit) { audit && audit.status == 1 &&
if (audit.status == 1) { <Button type="ghost"
const {bankCard, balance, balanceLong, amountLong} = audit; onClick={e=>{e.preventDefault(); this.setState({isEdit: !this.state.isEdit})}}>
if (!balance) { <Icon type="edit"/>
memo.push('无余额可用'); </Button>
} else if (balanceLong < amountLong) { }
memo.push('余额不足'); <Button type="ghost" onClick={e=>{
} e.preventDefault();
isEdit ?
const {name, bank, bankBranch, num} = bankCard; this.setState({isEdit: !this.state.isEdit}) :
this.props.history.goBack();
if (!name) { }}>
memo.push('无持卡人'); <Icon type="rollback"/>
} </Button>
if (!num) { </Button.Group>
memo.push('无银行卡号'); </div>
} );
if (!bank || !bankBranch) {
memo.push('无开户行信息');
}
} else {
memo.push(audit.memo);
}
}
memo = memo.join('\n'); const header = (<MainHeader breadcrumb={['审核管理', '提现审核','审核详情']} title={title} operation={operation}/>);
return ( return (
...@@ -128,51 +179,84 @@ export default class PassItem extends Component { ...@@ -128,51 +179,84 @@ export default class PassItem extends Component {
<Spin spinning={loading}> <Spin spinning={loading}>
{ {
audit && audit &&
<Form horizontal> <Form horizontal className="main-form">
<Form.Item label="申请时间" {...smallFormItemLayout}> <Row style={{padding:'0 20px'}}>
<Input placeholder="申请时间" readOnly <Col span="12">
defaultValue={audit.dateCreated && formatDateTime(audit.dateCreated) || '错误的时间'} <Form.Item label="申请时间" {...smallFormItemLayout}>
/> {audit.dateCreated && formatDateTime(audit.dateCreated) || '错误的时间'}
</Form.Item> </Form.Item>
<Form.Item label="当前余额" {...smallFormItemLayout}> <Form.Item label="当前余额" {...smallFormItemLayout}>
<Input placeholder="当前余额" readOnly {audit.balance || NULL}
defaultValue={audit.balance}/> </Form.Item>
</Form.Item> <Form.Item label="持卡人" {...smallFormItemLayout}>
<Form.Item label="持卡人信息" {...smallFormItemLayout}> {audit.bankCard && audit.bankCard.username || NULL}
<Input placeholder="持卡人信息" readOnly </Form.Item>
defaultValue={'持卡人:'+(audit.name || '') + ' 卡号:'+(audit.number || '')}/> <Form.Item label="卡号" {...smallFormItemLayout}>
</Form.Item> {audit.bankCard && audit.bankCard.num || NULL}
<Form.Item label="银行卡信息" {...smallFormItemLayout}> </Form.Item>
<Input placeholder="银行卡信息" readOnly <Form.Item label="银行卡信息" {...smallFormItemLayout}>
defaultValue={(audit.bankCard.bank || '') + ( audit.bankCard.bankBranch || '') }/> {audit.bankCard && audit.bankCard.bank || NULL }
</Form.Item> {" - "}
<Form.Item label="提现金额" {...smallFormItemLayout}> {audit.bankCard && audit.bankCard.bankBranch || NULL}
<Input placeholder="实际入账金额" readOnly defaultValue={audit.amount}/> </Form.Item>
</Form.Item> <Form.Item label="提现金额" {...smallFormItemLayout}>
{audit.amount || NULL}
<Form.Item label="拒绝理由" {...smallFormItemLayout}> </Form.Item>
<Input placeholder="拒绝理由" readOnly={readOnly} type="textarea" autosize {
{...getFieldProps('memo', { audit.status == 5 ?
initialValue: memo <Form.Item label="拒绝理由" {...smallFormItemLayout}>
})} /> { audit.memo || NULL }
</Form.Item> </Form.Item>
<Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}> :
{ (
audit.status == 1 && audit.status == 1 && isEdit &&
<span> <Form.Item label="拒绝理由" {...smallFormItemLayout}>
<Button size="large" type="primary" onClick={this.handleSubmit.bind(this, 9)}> <Input placeholder="拒绝理由" type="textarea"
<Icon type="check-circle-o"/>通过 autosize
</Button> {...getFieldProps('memo', {
<Button size="large" type="ghost" onClick={this.handleSubmit.bind(this, 5)} initialValue: ''
style={{margin:'auto 1em' }}> })} />
<Icon type="cross-circle-o"/>拒绝 </Form.Item>
)
}
<Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}>
{
audit.status == 1 && (
isEdit ?
<span>
<Button size="large" type="primary"
onClick={this.handleSubmit.bind(this, 9)}>
<Icon type="check-circle-o"/>通过
</Button>
<Button size="large" type="ghost"
onClick={this.handleSubmit.bind(this, 5)}
style={{margin:'auto 1em' }}>
<Icon type="cross-circle-o"/>拒绝
</Button>
</span>
:
<Button type="primary"
style={{marginRight:'1em'}}
onClick={ e=>{
e.preventDefault();
this.setState({isEdit: !this.state.isEdit})
}}>
<Icon type="edit"/>审核
</Button>
)
}
<Button onClick={e=>{
e.preventDefault();
isEdit ?
this.setState({isEdit: !this.state.isEdit}) :
this.props.history.goBack();
}}>
<Icon type="rollback"/>
{isEdit?'取消':'返回'}
</Button> </Button>
</span> </Form.Item>
} </Col>
<Button onClick={e=>{e.preventDefault(); this.props.history.goBack();}}> </Row>
<Icon type="rollback"/>返回
</Button>
</Form.Item>
</Form> </Form>
} }
</Spin> </Spin>
......
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