ecshop/ECShopX_mobile-frontend
1
0
Fork 0
mirror of https://gitee.com/ShopeX/ECShopX_mobile-frontend synced 2026-08-14 09:25:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

注册

Browse Source
This commit is contained in:
chenhui0212
2019-02-27 17:17:44 +08:00
parent b9b7006eb2
commit b254300c69
10 changed files with 468 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

416
.idea/workspace.xml generated
View File

@@ -2,35 +2,17 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c4b5bd0d-fb3c-48cd-90a1-e84add737e52" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/assets/imgs/trade/ico_wait_buyer_confirm_goods.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/assets/imgs/trade/ico_wait_buyer_pay.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/assets/imgs/trade/ico_wait_rate.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/assets/imgs/trade/ico_wait_seller_send_goods.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/assets/imgs/trades_empty.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/pages/trade/comps/order-item.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/pages/trade/comps/order-item.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/pages/trade/detail.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/pages/trade/detail.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/pages/trade/rate.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/pages/trade/rate.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/components/timer/index.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/components/timer/index.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/pages/auth/login.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/pages/auth/login.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/pages/auth/reg.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/pages/auth/reg.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/api/user.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/api/user.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/app.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/assets/imgs/address_empty@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/src/assets/imgs/address_empty.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/address/picker.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/address/picker.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/hocs/withPager.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/hocs/withPager.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/trade/comps/item.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/trade/comps/item.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/trade/comps/item.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/trade/comps/item.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/trade/list.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/trade/list.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/trade/list.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/trade/list.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/style/variables.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/style/variables.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/trade/trade/item.scss" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/index.js" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/dist/" />
<ignored path="$PROJECT_DIR$/.tmp/" />
@@ -47,8 +29,49 @@
<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="515">
<caret line="92" column="15" selection-start-line="92" selection-start-column="15" selection-end-line="92" selection-end-column="15" />
<state relative-caret-position="90">
<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/auth/reg.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="28" column="21" lean-forward="true" selection-start-line="28" selection-start-column="21" selection-end-line="28" selection-end-column="21" />
<folding>
<element signature="e#0#46#0" expanded="true" />
<element signature="e#188#209#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/auth/login.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/auth/login.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/api/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="1" lean-forward="true" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/cart/checkout.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="240" column="17" selection-start-line="240" selection-start-column="10" selection-end-line="240" selection-end-column="17" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
@@ -57,13 +80,28 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/search/index.js">
<entry file="file://$PROJECT_DIR$/src/components/address/edit.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 relative-caret-position="60">
<caret line="4" selection-start-line="4" selection-end-line="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/auth/reg.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
</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="158">
<caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" selection-end-column="21" />
</state>
</provider>
</entry>
@@ -80,42 +118,6 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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>
</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="384">
<caret line="52" column="20" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="20" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="24" column="29" selection-start-line="24" selection-start-column="29" selection-end-line="24" selection-end-column="29" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
@@ -136,6 +138,9 @@
<find>$color-brand</find>
<find>color-brand</find>
<find>$color-brand-primary</find>
<find>btn</find>
<find>btns</find>
<find>handleSubmit</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -144,24 +149,32 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/app.js" />
<option value="$PROJECT_DIR$/src/api/index.js" />
<option value="$PROJECT_DIR$/src/components/search/search.js" />
<option value="$PROJECT_DIR$/src/components/search/search.scss" />
<option value="$PROJECT_DIR$/src/components/index.js" />
<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/app.js" />
<option value="$PROJECT_DIR$/src/components/timer/index.scss" />
<option value="$PROJECT_DIR$/src/components/index.js" />
<option value="$PROJECT_DIR$/src/components/timer/index.js" />
<option value="$PROJECT_DIR$/src/pages/auth/reg.scss" />
<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/pages/auth/reg.js" />
<option value="$PROJECT_DIR$/src/pages/auth/login.js" />
<option value="$PROJECT_DIR$/src/pages/auth/login.scss" />
<option value="$PROJECT_DIR$/src/pages/index/index.js" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="267" />
<option name="y" value="85" />
<option name="x" value="335" />
<option name="y" value="192" />
<option name="width" value="1400" />
<option name="height" value="937" />
</component>
@@ -182,6 +195,12 @@
<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="api" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
@@ -200,14 +219,7 @@
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" />
<item name="back-to-top" 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="search" type="462c0819:PsiDirectoryNode" />
<item name="timer" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
@@ -215,6 +227,13 @@
<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="auth" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
<item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
@@ -236,20 +255,6 @@
<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="item" 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" />
@@ -303,15 +308,15 @@
<option name="presentableId" value="Default" />
<updated>1551168703692</updated>
<workItem from="1551168706548" duration="6029000" />
<workItem from="1551178435380" duration="16900000" />
<workItem from="1551178435380" duration="22625000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="22929000" />
<option name="totallyTimeSpent" value="28654000" />
</component>
<component name="ToolWindowManager">
<frame x="267" y="85" width="1400" height="937" extended-state="0" />
<frame x="335" y="192" 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" />
@@ -338,9 +343,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/pages/cart/index.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/cart/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
@@ -354,16 +356,6 @@
<entry file="file://$PROJECT_DIR$/src/api/wx.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/api/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="10" selection-start-line="17" selection-start-column="10" selection-end-line="17" selection-end-column="10" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</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="388">
@@ -435,13 +427,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/cart/checkout-items.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
@@ -449,26 +434,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348">
<caret line="35" column="37" lean-forward="true" selection-start-line="35" selection-start-column="37" selection-end-line="35" selection-end-column="37" />
<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="195">
<caret line="13" column="2" selection-start-line="13" selection-start-column="2" selection-end-line="19" selection-end-column="3" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/back-to-top/index.js">
<provider selected="true" editor-type-id="text-editor">
<state>
@@ -488,16 +453,6 @@
</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="1913">
<caret line="240" column="17" selection-start-line="240" selection-start-column="10" selection-end-line="240" selection-end-column="17" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</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="45">
@@ -512,16 +467,6 @@
</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="515">
<caret line="92" column="15" selection-start-line="92" selection-start-column="15" selection-end-line="92" selection-end-column="15" />
<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" />
@@ -544,13 +489,6 @@
<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/app.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="24" column="29" selection-start-line="24" selection-start-column="29" selection-end-line="24" selection-end-column="29" />
</state>
</provider>
</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">
@@ -558,13 +496,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/style/variables.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="384">
<caret line="52" column="20" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="20" />
</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">
@@ -582,6 +513,145 @@
</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/components/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/timer/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" lean-forward="true" selection-start-line="9" 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/components/timer/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="167">
<caret line="47" column="32" selection-start-line="47" selection-start-column="19" selection-end-line="47" selection-end-column="32" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257">
<caret line="27" column="23" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</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/style/variables.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/reg.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
</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="289">
<caret line="240" column="17" selection-start-line="240" selection-start-column="10" selection-end-line="240" selection-end-column="17" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/api/auth.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<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/api/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="1" lean-forward="true" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
</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="60">
<caret line="4" selection-start-line="4" selection-end-line="5" />
</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="90">
<caret line="6" selection-start-line="6" selection-end-line="7" />
</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="420">
<caret line="28" column="21" lean-forward="true" selection-start-line="28" selection-start-column="21" selection-end-line="28" selection-end-column="21" />
<folding>
<element signature="e#0#46#0" expanded="true" />
<element signature="e#188#209#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/login.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/login.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">

4
src/api/user.js
View File

@@ -7,3 +7,7 @@ export function login (data) {
export function logout () {
return req.post('/user.logout')
}
export function reg (data) {
return req.post('/user.reg', data)
}

2
src/app.js
View File

@@ -24,6 +24,8 @@ class App extends Component {
'pages/cart/checkout',
'pages/category/index',
'pages/auth/login',
'pages/auth/reg',
'pages/member/index',
'pages/member/favorite',

1
src/components/index.js
View File

@@ -9,6 +9,7 @@ export { default as AddressPicker } from './address/picker'
export { default as TabBar } from './tab-bar'
export { default as SearchPanel } from './search'
export { default as Timer } from './timer'
export { default as SpCheckbox } from './checkbox'
export { default as SpCell } from './cell'

95
src/components/timer/index.js Normal file
View File

@@ -0,0 +1,95 @@
import Taro, { Component } from '@tarojs/taro'
import { Text } from '@tarojs/components'
import { classNames } from '@/utils'
import './index.scss'
export default class Timer extends Component {
static options = {
addGlobalClass: true
}
static defaultProps = {
duration: 60,
defaultMsg: '发送验证码',
msg: '重新发送'
}
constructor (props) {
super(props)
this.state = {
countDur: props.duration,
sent: false
}
}
componentDidMount () {
}
componentWillUnmount () {
this.stop()
}
handleClick = () => {
if (this.timer) return
if (!this.timer) {
this.start()
}
this.setState({
sent: true
})
}
start () {
this.stop()
const next = () => {
this.timer = setTimeout(() => {
const countDur = this.state.countDur - 1
this.props.onUpdateTimer && this.props.onUpdateTimer(countDur)
this.setState({
countDur
})
if (countDur > 0) {
next()
} else {
this.stop()
this.setState({
countDur: this.props.duration
})
this.props.onStop && this.props.onStop()
}
}, 1000)
}
if (this.props.onStart(this.state.countDur) !== false) {
next()
}
}
stop () {
if (this.timer) {
clearTimeout(this.timer)
this.timer = null
}
}
render () {
const { timer } = this
const { countDur, sent } = this.state
const { timerMsg, className } = this.props
const msg = timerMsg || (timer
? `${countDur}s`
: sent
? this.props.msg
: this.props.defaultMsg)
return (
<Text
className={classNames('mobile-timer', { 'mobile-timer__counting': timer }, className)}
onClick={this.handleClick}
>
{msg}
</Text>
)
}
}

9
src/components/timer/index.scss Normal file
View File

@@ -0,0 +1,9 @@
@import '../../style/imports';
.mobile-timer {
color: $color-red !important;
font-size: $font-size-small !important;
&__counting {
color: $color-gray !important;
}
}

0
src/pages/auth/login.js Normal file
View File

0
src/pages/auth/login.scss Normal file
View File

97
src/pages/auth/reg.js Normal file
View File

@@ -0,0 +1,97 @@
import Taro, { Component } from '@tarojs/taro'
import { View, Text } from '@tarojs/components'
import { AtForm, AtInput, AtButton } from 'taro-ui'
// import { SpCell } from '@/components'
import S from '@/spx'
import api from '@/api'
import './reg.scss'
export default class Reg extends Component {
constructor (props) {
super(props)
this.state = {
info: {}
}
}
handleSubmit = (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)
const { UserInfo } = api.user.reg(data)
console.log(UserInfo)
}
handleChange = (name, val) => {
const { info } = this.state
info[name] = val
console.log(info)
}
handleClickAgreement = () => {
console.log("用户协议")
}
render () {
const { info } = this.state
return (
<View className='address-edit'>
<AtForm
onSubmit={this.handleSubmit}
>
<View className='sec address-edit__form'>
<AtInput
title='手机号码'
name='mobile'
maxLength={11}
value={info.mobile}
onChange={this.handleChange.bind(this, 'mobile')}
/>
<AtInput
title='验证码'
name='code'
value={info.code}
onChange={this.handleChange.bind(this, 'code')}
/>
<AtInput
title='密码'
name='password'
value={info.password}
onChange={this.handleChange.bind(this, 'password')}
/>
</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>
</View>
)
}
}

17
src/pages/auth/reg.scss Normal file
View File

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