Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin

* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  积分列表
  积分

# Conflicts:
#	src/pages/index/index.js
This commit is contained in:
bentz
2019-02-28 16:15:22 +08:00
12 changed files with 1216 additions and 49 deletions

725
.idea/workspace.xml generated Normal file
View File

@@ -0,0 +1,725 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c4b5bd0d-fb3c-48cd-90a1-e84add737e52" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/pages/auth/forgotpwd.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/pages/auth/forgotpwd.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/assets/fonts/iconfont.ttf" beforeDir="false" afterPath="$PROJECT_DIR$/src/assets/fonts/iconfont.ttf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/assets/fonts/iconfont.woff" beforeDir="false" afterPath="$PROJECT_DIR$/src/assets/fonts/iconfont.woff" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/auth/login.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/auth/login.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/auth/login.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/auth/login.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/auth/reg.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/auth/reg.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/index/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/member/integral.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/member/integral.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/member/integral.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/member/integral.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/style/icon.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/style/icon.scss" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/dist/" />
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" selection-start-line="14" selection-end-line="14" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/member/integral.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="26" lean-forward="true" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="26" />
<folding>
<element signature="e#1#47#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/trade/list.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="463">
<caret line="108" column="15" lean-forward="true" selection-start-line="108" selection-start-column="15" selection-end-line="108" selection-end-column="15" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/trade/list.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="21" column="20" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/member/integral.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<caret line="104" column="27" lean-forward="true" selection-start-line="104" selection-start-column="27" selection-end-line="104" selection-end-column="27" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/style/variables.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="262">
<caret line="42" column="4" selection-start-line="42" selection-start-column="4" selection-end-line="42" selection-end-column="4" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/category/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-312">
<caret line="6" selection-start-line="6" selection-end-line="7" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/category/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="32" column="16" lean-forward="true" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>AtActionSheet</find>
<find>isOpend</find>
<find>toggleAddressPicker</find>
<find>AddressPicker</find>
<find>page-view</find>
<find>lockScreen</find>
<find>SearchPanel</find>
<find>changeSelection</find>
<find>CheckoutItems</find>
<find>handleChangeSearch</find>
<find>#FF482B</find>
<find>$color-brand</find>
<find>color-brand</find>
<find>$color-brand-primary</find>
<find>btn</find>
<find>btns</find>
<find>handleSubmit</find>
<find>S</find>
<find>mobile-timer</find>
<find>re</find>
<find>id</find>
<find>handleErrorToastClose</find>
<find>handleSendCode</find>
<find>handleClick</find>
<find>handleTimerStop</find>
<find>onStart</find>
<find>navigateTo</find>
<find>page</find>
<find>api</find>
<find>fetch</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/components/search/search.js" />
<option value="$PROJECT_DIR$/src/components/search/search.scss" />
<option value="$PROJECT_DIR$/src/pages/category/index.scss" />
<option value="$PROJECT_DIR$/src/pages/category/index.js" />
<option value="$PROJECT_DIR$/src/components/search/index.scss" />
<option value="$PROJECT_DIR$/src/style/taro-ui-mod.scss" />
<option value="$PROJECT_DIR$/src/style/variables.scss" />
<option value="$PROJECT_DIR$/src/components/search/index.js" />
<option value="$PROJECT_DIR$/src/components/index.js" />
<option value="$PROJECT_DIR$/src/components/address/edit.js" />
<option value="$PROJECT_DIR$/src/api/index.js" />
<option value="$PROJECT_DIR$/src/api/user.js" />
<option value="$PROJECT_DIR$/src/components/timer/index.scss" />
<option value="$PROJECT_DIR$/src/pages/auth/reg.scss" />
<option value="$PROJECT_DIR$/src/components/timer/index.js" />
<option value="$PROJECT_DIR$/src/pages/auth/forgotpwd.scss" />
<option value="$PROJECT_DIR$/src/app.js" />
<option value="$PROJECT_DIR$/src/style/icon.scss" />
<option value="$PROJECT_DIR$/src/pages/auth/login.scss" />
<option value="$PROJECT_DIR$/src/pages/auth/login.js" />
<option value="$PROJECT_DIR$/src/pages/auth/reg.js" />
<option value="$PROJECT_DIR$/src/pages/auth/forgotpwd.js" />
<option value="$PROJECT_DIR$/src/pages/member/integral.scss" />
<option value="$PROJECT_DIR$/src/pages/member/integral.js" />
<option value="$PROJECT_DIR$/src/pages/index/index.js" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="628" />
<option name="y" value="87" />
<option name="width" value="1400" />
<option name="height" value="937" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
<item name="fonts" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" />
<item name="icon-menu" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="category" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="member" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="trade" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="style" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="editor.config.ad.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
<property name="node.js.selected.package.eslint" value="$PROJECT_DIR$/node_modules/eslint" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="c4b5bd0d-fb3c-48cd-90a1-e84add737e52" name="Default Changelist" comment="" />
<created>1551168703692</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1551168703692</updated>
<workItem from="1551168706548" duration="6029000" />
<workItem from="1551178435380" duration="33108000" />
<workItem from="1551332673381" duration="7969000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="47106000" />
</component>
<component name="ToolWindowManager">
<frame x="628" y="87" width="1400" height="937" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13560551" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="npm" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<window_info anchor="bottom" id="Terminal" order="10" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/components/back-to-top/index.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/cart/checkout-items.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="25" lean-forward="true" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/style/_md-colors.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3462" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/style/_mixins.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-942" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/style/animations.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/style/imports.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/index/index.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/style/taro-ui-mod.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="600">
<caret line="40" column="69" selection-start-line="40" selection-start-column="69" selection-end-line="40" selection-end-column="69" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/search/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="681">
<caret line="50" selection-start-line="50" selection-end-line="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/search/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="55" column="10" lean-forward="true" selection-start-line="55" selection-start-column="10" selection-end-line="55" selection-end-column="10" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/address/edit.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" lean-forward="true" selection-end-line="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/cart/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="24" column="28" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/api/auth.js" />
<entry file="file://$PROJECT_DIR$/src/api/req.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#31#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/api/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" selection-start-line="8" selection-end-line="8" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/cart/checkout.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="232" column="22" selection-start-line="232" selection-start-column="9" selection-end-line="232" selection-end-column="22" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/api/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="24" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/address/picker.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="709">
<caret line="205" column="8" lean-forward="true" selection-start-line="205" selection-start-column="8" selection-end-line="205" selection-end-column="19" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/components/timer/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="58" selection-start-line="7" selection-start-column="52" selection-end-line="7" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/toast/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="583">
<caret line="65" column="16" selection-start-line="65" selection-start-column="8" selection-end-line="65" selection-end-column="16" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/address/edit.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-184">
<caret line="41" column="14" selection-start-line="41" selection-start-column="13" selection-end-line="41" selection-end-column="14" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/trade/detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="33" column="2" lean-forward="true" selection-start-line="33" selection-start-column="2" selection-end-line="44" selection-end-column="3" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/api/member.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/components/timer/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="31" lean-forward="true" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.editorconfig">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/reg.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="9" selection-end-line="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/forgotpwd.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="28" column="27" selection-start-line="28" selection-start-column="18" selection-end-line="28" selection-end-column="27" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/icon-menu/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="15" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Downloads/font_1056698_kuw2cgk7rwh/demo.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/icon-menu/index.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/style/icon.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="27" column="14" selection-start-line="27" selection-start-column="1" selection-end-line="27" selection-end-column="14" />
<folding>
<element signature="e#73#4803#1" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/login.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="20" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="79">
<caret line="16" selection-start-line="16" selection-end-line="17" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/forgotpwd.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="25" column="5" lean-forward="true" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/reg.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="632">
<caret line="137" column="22" lean-forward="true" selection-start-line="132" selection-start-column="14" selection-end-line="137" selection-end-column="22" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/member/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="20" column="31" selection-end-line="135" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/member/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
<folding>
<element signature="e#0#46#0" expanded="true" />
<element signature="e#768#3282#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/member/favorite.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/category/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-312">
<caret line="6" selection-start-line="6" selection-end-line="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/category/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="32" column="16" lean-forward="true" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/style/variables.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="262">
<caret line="42" column="4" selection-start-line="42" selection-start-column="4" selection-end-line="42" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/trade/list.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="21" column="20" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/member/integral.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<caret line="104" column="27" lean-forward="true" selection-start-line="104" selection-start-column="27" selection-end-line="104" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/trade/list.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="463">
<caret line="108" column="15" lean-forward="true" selection-start-line="108" selection-start-column="15" selection-end-line="108" selection-end-column="15" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/member/integral.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="26" lean-forward="true" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="26" />
<folding>
<element signature="e#1#47#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" selection-start-line="14" selection-end-line="14" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

View File

@@ -26,9 +26,11 @@ class App extends Component {
'pages/category/index',
'pages/auth/login',
'pages/auth/reg',
'pages/auth/forgotpwd',
'pages/member/index',
'pages/member/favorite',
'pages/member/integral',
'pages/trade/list',
'pages/trade/detail',
'pages/trade/rate'

Binary file not shown.

Binary file not shown.

144
src/pages/auth/forgotpwd.js Normal file
View File

@@ -0,0 +1,144 @@
import Taro, { Component } from '@tarojs/taro'
import { View, Text } from '@tarojs/components'
import { AtForm, AtInput, AtButton } from 'taro-ui'
import { SpToast, Timer } from '@/components'
import S from '@/spx'
import api from '@/api'
import './forgotpwd.scss'
export default class Forgotpwd extends Component {
constructor (props) {
super(props)
this.state = {
info: {},
timerMsg: '获取验证码',
isVisible: false
}
}
handleSubmit = async (e) => {
const { value } = e.detail
const data = {
...this.state.info,
...value
}
if (!data.mobile || !/1\d{10}/.test(data.mobile)) {
return S.toast('请输入正确的手机号')
}
if (!data.code) {
return S.toast('请选择验证码')
}
if (!data.password) {
return S.toast('请输入密码')
}
console.log(data, 19)
// if(this.state.isForgot){
//
// }
// const { UserInfo } = await api.user.reg(data)
// console.log(UserInfo)
}
handleChange = (name, val) => {
const { info } = this.state
info[name] = val
}
handleClickIconpwd = () => {
const { isVisible } = this.state
this.setState({
isVisible: !isVisible,
});
}
handleErrorToastClose = () => {
S.closeToast()
}
handleTimerStart = (resolve) => {
if (this.state.isTimerStart) return
const { mobile } = this.state.info
if (!/1\d{10}/.test(mobile)) {
return S.toast('请输入正确的手机号')
}
resolve()
}
handleUpdateTimer = (val) => {
const timerMsg = `${val}s`
this.setState({
timerMsg
})
}
handleTimerStop = () => {
this.setState({
timerMsg: '重新获取'
})
}
render () {
const { info, timerMsg, isVisible } = this.state
return (
<View className='auth-forgotpwd'>
<AtForm
onSubmit={this.handleSubmit}
>
<View className='sec auth-forgotpwd__form'>
<AtInput
title='手机号码'
name='mobile'
maxLength={11}
value={info.mobile}
placeholder='请输入手机号码'
onFocus={this.handleErrorToastClose}
onChange={this.handleChange.bind(this, 'mobile')}
/>
<AtInput
title='验证码'
name='code'
value={info.code}
placeholder='请输入验证码'
onFocus={this.handleErrorToastClose}
onChange={this.handleChange.bind(this, 'code')}
>
<Timer
onStart={this.handleTimerStart}
onUpdateTimer={this.handleUpdateTimer}
onStop={this.handleTimerStop}
timerMsg={timerMsg}
/>
</AtInput>
<AtInput
title='密码'
name='password'
type={isVisible ? 'text' : 'password'}
value={info.password}
placeholder='请输入密码'
onFocus={this.handleErrorToastClose}
onChange={this.handleChange.bind(this, 'password')}
>
{
isVisible
? <View className='sp-icon sp-icon-yanjing icon-pwd' onClick={this.handleClickIconpwd}> </View>
: <View className='sp-icon sp-icon-icon6 icon-pwd' onClick={this.handleClickIconpwd}> </View>
}
</AtInput>
</View>
<View className='btns'>
<AtButton type='primary' formType='submit'>确认</AtButton>
</View>
</AtForm>
<SpToast />
</View>
)
}
}

View File

@@ -0,0 +1,17 @@
@import "../../style/imports";
.auth-forgotpwd {
&__form {
background: #fff;
padding: $edge-size;
margin: 0 0 $edge-margin;
}
.accountAgreement{
width: 100%;
text-align: center;
&__text {
color: $color-brand-primary;
}
}
}

View File

@@ -1,7 +1,8 @@
import Taro, { Component } from '@tarojs/taro'
import { View, Text } from '@tarojs/components'
import { AtForm, AtInput, AtButton } from 'taro-ui'
import { SpToast } from '@/components'
import { SpToast, SpIconMenu } from '@/components'
import S from '@/spx'
import api from '@/api'
@@ -13,6 +14,7 @@ export default class Login extends Component {
this.state = {
info: {},
isVisible: false
}
}
@@ -32,10 +34,6 @@ export default class Login extends Component {
return S.toast('请输入正确的手机号')
}
if (!data.code) {
return S.toast('请选择验证码')
}
if (!data.password) {
return S.toast('请输入密码')
}
@@ -50,18 +48,25 @@ export default class Login extends Component {
console.log(info)
}
handleClickIconpwd = () => {
const { isVisible } = this.state
this.setState({
isVisible: !isVisible,
});
}
handleErrorToastClose = () => {
S.closeToast()
}
handleClickForgtPwd = () => {
Taro.navigateTo({
url: `/pages/auth/reg?forgot=forgot`
url: `/pages/auth/forgotpwd`
})
}
render () {
const { info } = this.state
const { info, isVisible } = this.state
return (
<View className='auth-login'>
@@ -80,13 +85,19 @@ export default class Login extends Component {
onChange={this.handleChange.bind(this, 'mobile')}
/>
<AtInput
title='验证码'
name='code'
value={info.code}
placeholder='请输入验证码'
title='码'
name='password'
type={isVisible ? 'text' : 'password'}
value={info.password}
placeholder='请输入密码'
onFocus={this.handleErrorToastClose}
onChange={this.handleChange.bind(this, 'code')}
onChange={this.handleChange.bind(this, 'password')}
>
{
isVisible
? <View className='sp-icon sp-icon-yanjing icon-pwd' onClick={this.handleClickIconpwd}> </View>
: <View className='sp-icon sp-icon-icon6 icon-pwd' onClick={this.handleClickIconpwd}> </View>
}
<Text className='forgotPwd' onClick={this.handleClickForgtPwd}>忘记密码</Text>
</AtInput>
</View>

View File

@@ -12,6 +12,9 @@
background: #fff;
padding: $edge-size;
margin: 0 0 $edge-margin;
.icon-pwd {
line-height: 40px;
}
.forgotPwd{
font-size: 28px;
}

View File

@@ -14,20 +14,7 @@ export default class Reg extends Component {
this.state = {
info: {},
timerMsg: '获取验证码',
isForgot: false
}
}
componentDidMount () {
}
async fetch () {
const { forgot } = this.$router.params
console.log(forgot)
if(forgot){
this.setState({
isForgot: true,
});
isVisible: false
}
}
@@ -61,6 +48,13 @@ export default class Reg extends Component {
info[name] = val
}
handleClickIconpwd = () => {
const { isVisible } = this.state
this.setState({
isVisible: !isVisible,
});
}
handleErrorToastClose = () => {
S.closeToast()
}
@@ -95,7 +89,7 @@ export default class Reg extends Component {
}
render () {
const { info, timerMsg, isForgot } = this.state
const { info, timerMsg, isVisible } = this.state
return (
<View className='auth-reg'>
@@ -130,31 +124,31 @@ export default class Reg extends Component {
<AtInput
title='密码'
name='password'
type={isVisible ? 'text' : 'password'}
value={info.password}
placeholder='请输入密码'
onFocus={this.handleErrorToastClose}
onChange={this.handleChange.bind(this, 'password')}
/>
>
{
isVisible
? <View className='sp-icon sp-icon-yanjing icon-pwd' onClick={this.handleClickIconpwd}> </View>
: <View className='sp-icon sp-icon-icon6 icon-pwd' onClick={this.handleClickIconpwd}> </View>
}
</AtInput>
</View>
<View className='btns'>
<AtButton type='primary' formType='submit'>同意协议并注册</AtButton>
<View className='accountAgreement'>
已阅读并同意
<Text
className='accountAgreement__text'
onClick={this.handleClickAgreement.bind(this)}
>
用户协议
</Text>
</View>
</View>
{
isForgot
? <View className='btns'>
<AtButton type='primary' formType='submit'>确认</AtButton>
</View>
: <View className='btns'>
<AtButton type='primary' formType='submit'>同意协议并注册</AtButton>
<View className='accountAgreement'>
已阅读并同意
<Text
className='accountAgreement__text'
onClick={this.handleClickAgreement.bind(this)}
>
用户协议
</Text>
</View>
</View>
}
</AtForm>
<SpToast />

View File

@@ -0,0 +1,136 @@
import Taro, { Component } from '@tarojs/taro'
import {View, Text, ScrollView} from '@tarojs/components'
import {AtBadge, AtIcon, AtAvatar, AtTabs, AtTabsPane} from 'taro-ui'
import { Loading, SpNote } from '@/components'
import { withPager } from '@/hocs'
import api from '@/api'
// import { TradeItem } from './comps/item'
import './integral.scss'
@withPager
export default class Integral extends Component {
constructor (props) {
super(props)
this.state = {
...this.state,
curTabIdx: 0,
tabList: [
{title: '全部', status: ''},
{title: '收入', status: 'INCOME'},
{title: '支出', status: 'EXPEND'}
],
list: [],
isLoading: false
}
}
componentDidMount () {
const { status } = this.$router.params
const tabIdx = this.state.tabList.findIndex(tab => tab.status === status)
if (tabIdx >= 0) {
this.setState({
curTabIdx: tabIdx
}, () => {
this.nextPage()
})
} else {
this.nextPage()
}
}
async fetch (params) {
this.setState({ isLoading: true })
const { tabList, curTabIdx } = this.state
params = {
...params,
status: tabList[curTabIdx].status
}
const { list, total_count: total } = await api.trade.list(params)
const nList = this.state.list.concat(list)
this.setState({
list: nList,
isLoading: false
})
return { total }
}
handleClickTab = (idx) => {
if (this.state.isLoading || this.state.page.isLoading) return
if (idx !== this.state.curTabIdx) {
this.resetPage()
this.setState({
list: []
})
}
this.setState({
curTabIdx: idx
}, () => {
this.nextPage()
})
}
render () {
const { curTabIdx, tabList, list, page } = this.state
return (
<View className='page-member-integral'>
<View className='member-integral__hd'>
<View className='integral-info'>
<View className='integral-number'>图标<Text className='integral-number__text'>1888</Text></View>
<View className='integral-text'>当前可用积分</View>
</View>
</View>
<View className='member-integral__bd'>
<View className='integral-sec integral-info__status'>
<Text className='integral-sec__horn'>喇叭</Text>
<Text className='integral-sec__share'>分享推荐可获取积分呦赶紧行动吧~</Text>
</View>
<View className='integral-sec member-integral'>
<AtTabs
className='member-integral__tabs'
current={curTabIdx}
tabList={tabList}
onClick={this.handleClickTab}
>
{
tabList.map((panes, pIdx) =>
(<AtTabsPane
current={curTabIdx}
key={pIdx}
index={pIdx}
>
</AtTabsPane>)
)
}
</AtTabs>
<ScrollView
scrollY
className='member-integral__scroll'
onScrollToLower={this.nextPage}
>
{
page.isLoading && <Loading>正在加载...</Loading>
}
{
!page.isLoading && !page.hasNext && !list.length
&& (<SpNote img='trades_empty.png'>赶快赚积分吧~</SpNote>)
}
</ScrollView>
</View>
</View>
</View>
)
}
}

View File

@@ -0,0 +1,122 @@
@import '../../style/imports';
.page-member-integral {
padding-bottom: $tabbar-height;
.sp-icon-pay, .sp-icon-clock, .sp-icon-baoguo, .sp-icon-comment {
@include iconfont-gradient(linear-gradient(90deg, #FAA761, #FA3515));
}
.sp-icon-star, .sp-icon-thumb {
@include iconfont-gradient(linear-gradient(270deg, #AF6FF7, #CD3AE3));
}
.sp-icon-money, .sp-icon-hongbao {
@include iconfont-gradient(linear-gradient(90deg, #FAD346, #F7B11C));
}
.sp-icon-setting, .sp-icon-help {
@include iconfont-gradient(linear-gradient(103deg, #7FD5FA, #2580FC));
}
.sp-icon-location {
@include iconfont-gradient(linear-gradient(270deg, #2757C5, #7298FD));
}
.sp-icon-qrcode {
@include iconfont-gradient(linear-gradient(90deg, #B4EC51, #429321));
}
}
.member-integral {
&__hd {
background: #FA3515;
background: linear-gradient(180deg,rgba(#FA9461, 1) 0%,rgba(#FA3515, 1) 100%);
height: 280px;
&:before {
transform: rotate(40deg) translate3D(0, -72%, 0);
background:linear-gradient(348deg,rgba(#fff, 0) 0%,rgba(#fff, 1) 100%);
content: '';
width: 300px;
height: 300px;
display: block;
position: absolute;
top: 0;
right: 0;
}
}
&__bd {
position: relative;
margin-top: -30px;
}
}
.integral {
&-info {
position: relative;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 50px 0 0;
color: #fff;
&__status {
padding: $edge-margin 0;
display: flex;
align-items: center;
color: #666;
font-size: 24px;
justify-content: space-around;
}
}
&-number{
&__text{
font-weight: bold;
font-size: 60px;
}
}
&-text{
margin-top: 30px;
font-weight: bold;
font-size: 36px;
}
&-sec {
background: #fff;
border-radius: 20px;
overflow: hidden;
margin: 0 30px 30px;
&__horn {
padding: 0 30px 0 60px;
}
&__share {
height: 60px;
line-height: 60px;
flex: 1;
text-align: left;
padding-left: 30px;
border-left: 2px solid #D9D9D9;
}
}
}
.member-integral {
padding: 0 30px;
position: fixed;
top: 380px;
right: 0px;
left: 0px;
bottom: 30px;
box-sizing: border-box;
&__scroll {
box-sizing: border-box;
}
//&__tabs {
// position: fixed;
// left: 0;
// top: 0;
// width: 100%;
//}
//.trade-item {
// margin: 0 $edge-size $edge-margin;
// .at-button {
// font-size: $font-size-small;
// padding-left: 26px;
// padding-right: 26px;
// margin-left: 20px;
// }
//}
}

View File

@@ -2,7 +2,7 @@
@font-face {
font-family: "sp-iconfont";
src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
url('/assets/fonts/iconfont.woff') format('woff'),
url('/assets/fonts/iconfont.ttf') format('truetype');
}
@@ -25,6 +25,10 @@
content: "\e65d";
}
.sp-icon-icon6:before {
content: "\e604";
}
.sp-icon-weixin:before {
content: "\e608";
}
@@ -41,6 +45,14 @@
content: "\e640";
}
.sp-icon-yanjing:before {
content: "\e684";
}
.sp-icon-shanchu:before {
content: "\e775";
}
.sp-icon-clock:before {
content: "\e615";
}
@@ -83,4 +95,5 @@
.sp-icon-user:before {
content: "\e618";
}
}