From 94f319eaeb914ce412270e313253775b420a1533 Mon Sep 17 00:00:00 2001
From: chenhui0212 <chenhui@shopex.cn>
Date: Thu, 28 Feb 2019 11:43:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml            | 189 ++++++++++++++++++---------------
 src/app.js                     |   1 +
 src/pages/member/integral.js   |  28 +++++
 src/pages/member/integral.scss |  46 ++++++++
 4 files changed, 178 insertions(+), 86 deletions(-)
 create mode 100644 src/pages/member/integral.js
 create mode 100644 src/pages/member/integral.scss

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 14ee84a9b..2074bb0ed 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c4b5bd0d-fb3c-48cd-90a1-e84add737e52" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/timer/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/timer/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/timer/index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/timer/index.scss" 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/auth/reg.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/auth/reg.scss" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/app.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/index/index.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
@@ -48,10 +42,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/components/timer/index.js">
+        <entry file="file://$PROJECT_DIR$/src/pages/index/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="392">
-              <caret line="67" column="4" selection-start-line="67" selection-start-column="4" selection-end-line="67" selection-end-column="4" />
+            <state relative-caret-position="195">
+              <caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
               <folding>
                 <element signature="e#0#46#0" expanded="true" />
               </folding>
@@ -60,10 +54,22 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/pages/index/index.js">
+        <entry file="file://$PROJECT_DIR$/src/pages/member/integral.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
+            <state relative-caret-position="120">
+              <caret line="8" column="29" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="29" />
+              <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/app.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="302">
+              <caret line="30" column="30" lean-forward="true" selection-start-line="30" selection-start-column="30" selection-end-line="30" selection-end-column="30" />
               <folding>
                 <element signature="e#0#46#0" expanded="true" />
               </folding>
@@ -71,6 +77,20 @@
           </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="681">
+              <caret line="46" lean-forward="true" selection-start-line="46" selection-end-line="46" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/api/member.js">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -103,6 +123,7 @@
       <find>handleClick</find>
       <find>handleTimerStop</find>
       <find>onStart</find>
+      <find>navigateTo</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -125,18 +146,20 @@
         <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/app.js" />
         <option value="$PROJECT_DIR$/src/pages/auth/login.scss" />
         <option value="$PROJECT_DIR$/src/pages/auth/login.js" />
-        <option value="$PROJECT_DIR$/src/pages/index/index.js" />
         <option value="$PROJECT_DIR$/src/pages/auth/reg.js" />
         <option value="$PROJECT_DIR$/src/components/timer/index.js" />
+        <option value="$PROJECT_DIR$/src/pages/member/integral.js" />
+        <option value="$PROJECT_DIR$/src/pages/member/integral.scss" />
+        <option value="$PROJECT_DIR$/src/app.js" />
+        <option value="$PROJECT_DIR$/src/pages/index/index.js" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="754" />
-    <option name="y" value="143" />
+    <option name="x" value="741" />
+    <option name="y" value="162" />
     <option name="width" value="1400" />
     <option name="height" value="937" />
   </component>
@@ -163,33 +186,6 @@
               <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" />
-              <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="address" 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="timer" 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="toast" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="espier-taro-fenxiao" type="b2602c69:ProjectViewProjectNode" />
               <item name="espier-taro-fenxiao" type="462c0819:PsiDirectoryNode" />
@@ -224,6 +220,13 @@
               <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" />
@@ -284,15 +287,15 @@
       <option name="presentableId" value="Default" />
       <updated>1551168703692</updated>
       <workItem from="1551168706548" duration="6029000" />
-      <workItem from="1551178435380" duration="29509000" />
+      <workItem from="1551178435380" duration="31186000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="35538000" />
+    <option name="totallyTimeSpent" value="37215000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="754" y="143" width="1400" height="937" extended-state="0" />
+    <frame x="741" y="162" 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" />
@@ -319,19 +322,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/pages/cart/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="125" column="16" selection-start-line="125" selection-start-column="16" selection-end-line="125" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/api/category.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/api/wx.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/components/cell/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -409,13 +399,6 @@
         </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">
-          <caret line="3" selection-start-line="3" selection-end-line="4" />
-        </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="710">
@@ -563,16 +546,6 @@
         </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="18" selection-start-line="27" selection-start-column="18" selection-end-line="27" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </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="30">
@@ -634,20 +607,37 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/pages/index/index.js">
+    <entry file="file://$PROJECT_DIR$/src/pages/auth/login.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
+        <state relative-caret-position="362">
+          <caret line="73" column="25" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="25" />
           <folding>
             <element signature="e#0#46#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/pages/auth/login.js">
+    <entry file="file://$PROJECT_DIR$/src/api/member.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/pages/member/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="73" column="25" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="25" />
+        <state relative-caret-position="45">
+          <caret line="3" selection-end-line="159" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/pages/member/index.scss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-line="135" selection-end-column="1" />
+        </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="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>
@@ -664,10 +654,37 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/timer/index.js">
+    <entry file="file://$PROJECT_DIR$/src/pages/member/integral.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="392">
-          <caret line="67" column="4" selection-start-line="67" selection-start-column="4" selection-end-line="67" selection-end-column="4" />
+        <state relative-caret-position="120">
+          <caret line="8" column="29" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="29" />
+          <folding>
+            <element signature="e#1#47#0" expanded="true" />
+          </folding>
+        </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="681">
+          <caret line="46" lean-forward="true" selection-start-line="46" selection-end-line="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/app.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="302">
+          <caret line="30" column="30" lean-forward="true" selection-start-line="30" selection-start-column="30" selection-end-line="30" selection-end-column="30" />
+          <folding>
+            <element signature="e#0#46#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="195">
+          <caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
           <folding>
             <element signature="e#0#46#0" expanded="true" />
           </folding>
diff --git a/src/app.js b/src/app.js
index f303b4169..d9ef6cafa 100644
--- a/src/app.js
+++ b/src/app.js
@@ -29,6 +29,7 @@ class App extends Component {
 
       'pages/member/index',
       'pages/member/favorite',
+      'pages/member/integral',
       'pages/trade/list',
       'pages/trade/detail',
       'pages/trade/rate'
diff --git a/src/pages/member/integral.js b/src/pages/member/integral.js
new file mode 100644
index 000000000..01c0222b1
--- /dev/null
+++ b/src/pages/member/integral.js
@@ -0,0 +1,28 @@
+
+import Taro, { Component } from '@tarojs/taro'
+import { View, Text } from '@tarojs/components'
+import { AtBadge, AtIcon, AtAvatar } from 'taro-ui'
+import { SpIconMenu, TabBar } from '@/components'
+
+import './integral.scss'
+
+export default class Integral extends Component {
+  navigateTo (url) {
+    Taro.navigateTo({ url })
+  }
+
+  componentDidShow () {
+  }
+
+  render () {
+    return (
+      <View className='page-member-index'>
+        <View className='member-index__hd'>
+          <View className='member-info'>
+            <View className='member-name'>鲜果优格果冻妹</View>
+          </View>
+        </View>
+      </View>
+    )
+  }
+}
diff --git a/src/pages/member/integral.scss b/src/pages/member/integral.scss
new file mode 100644
index 000000000..aa036f890
--- /dev/null
+++ b/src/pages/member/integral.scss
@@ -0,0 +1,46 @@
+@import '../../style/imports';
+
+.page-member-index {
+  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-index {
+  &__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;
+  }
+}

From f9c18297ca921c1a5ea78cb6af51211cf45f47ed Mon Sep 17 00:00:00 2001
From: chenhui0212 <chenhui@shopex.cn>
Date: Thu, 28 Feb 2019 16:06:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml            | 514 +++++++++++++++++++--------------
 src/app.js                     |   1 +
 src/assets/fonts/iconfont.ttf  | Bin 5472 -> 6160 bytes
 src/assets/fonts/iconfont.woff | Bin 3708 -> 4196 bytes
 src/pages/auth/forgotpwd.js    | 144 +++++++++
 src/pages/auth/forgotpwd.scss  |  17 ++
 src/pages/auth/login.js        |  35 ++-
 src/pages/auth/login.scss      |   3 +
 src/pages/auth/reg.js          |  64 ++--
 src/pages/index/index.js       |   2 +-
 src/pages/member/integral.js   | 128 +++++++-
 src/pages/member/integral.scss |  80 ++++-
 src/style/icon.scss            |  17 +-
 13 files changed, 733 insertions(+), 272 deletions(-)
 create mode 100644 src/pages/auth/forgotpwd.js
 create mode 100644 src/pages/auth/forgotpwd.scss

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9ac9b2b8c..bbf397fa0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,18 +2,19 @@
 <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/404.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/imgs/500.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/imgs/cart_empty.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/imgs/plane.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <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$/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/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/app.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/timer/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/timer/index.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/cart/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/cart/index.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/" />
@@ -27,35 +28,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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">
-            <state relative-caret-position="362">
-              <caret line="73" column="25" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="25" />
-              <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/auth/reg.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-19">
-              <caret line="116" column="21" lean-forward="true" selection-start-line="116" selection-start-column="21" selection-end-line="116" selection-end-column="21" />
-              <folding>
-                <element signature="e#0#46#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <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="240">
-              <caret line="16" column="3" lean-forward="true" selection-start-line="16" selection-start-column="3" selection-end-line="16" selection-end-column="3" />
+            <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>
@@ -63,21 +40,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.editorconfig">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
-          <provider selected="true" editor-type-id="text-editor" />
-        </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="120">
-              <caret line="8" column="29" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="29" />
+            <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>
@@ -86,10 +53,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/app.js">
+        <entry file="file://$PROJECT_DIR$/src/pages/trade/list.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="242">
-              <caret line="30" column="30" lean-forward="true" selection-start-line="30" selection-start-column="30" selection-end-line="30" selection-end-column="30" />
+            <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>
@@ -98,25 +65,54 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/pages/member/integral.scss">
+        <entry file="file://$PROJECT_DIR$/src/pages/trade/list.scss">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="681">
-              <caret line="46" lean-forward="true" selection-start-line="46" selection-end-line="46" />
+            <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/api/member.js">
-          <provider selected="true" editor-type-id="text-editor" />
+        <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>showAddressPicker</find>
-      <find>AtNavBar</find>
       <find>AtActionSheet</find>
       <find>isOpend</find>
       <find>toggleAddressPicker</find>
@@ -144,6 +140,9 @@
       <find>handleTimerStop</find>
       <find>onStart</find>
       <find>navigateTo</find>
+      <find>page</find>
+      <find>api</find>
+      <find>fetch</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -166,20 +165,23 @@
         <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/components/timer/index.js" />
-        <option value="$PROJECT_DIR$/src/pages/member/integral.js" />
+        <option value="$PROJECT_DIR$/src/pages/auth/forgotpwd.js" />
         <option value="$PROJECT_DIR$/src/pages/member/integral.scss" />
-        <option value="$PROJECT_DIR$/src/app.js" />
+        <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="656" />
-    <option name="y" value="75" />
+    <option name="x" value="628" />
+    <option name="y" value="87" />
     <option name="width" value="1400" />
     <option name="height" value="937" />
   </component>
@@ -188,6 +190,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -195,11 +198,81 @@
               <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>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -236,15 +309,17 @@
       <option name="presentableId" value="Default" />
       <updated>1551168703692</updated>
       <workItem from="1551168706548" duration="6029000" />
-      <workItem from="1551178435380" duration="31407000" />
+      <workItem from="1551178435380" duration="33108000" />
+      <workItem from="1551332673381" duration="7969000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="37436000" />
+    <option name="totallyTimeSpent" value="47106000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="656" y="75" width="1400" height="937" extended-state="0" />
+    <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" />
@@ -270,46 +345,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/pages/item/search.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/pages/item/search.scss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/pages/item/comps/item.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="24" column="55" lean-forward="true" selection-start-line="24" selection-start-column="55" selection-end-line="24" selection-end-column="55" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/address/picker.scss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="13" lean-forward="true" selection-end-line="39" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/hooks.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/utils/dom.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="30" column="17" lean-forward="true" selection-start-line="30" selection-start-column="17" selection-end-line="30" selection-end-column="17" />
-        </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">
-          <caret line="13" lean-forward="true" selection-end-line="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/components/back-to-top/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -329,13 +364,6 @@
         </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="710">
-          <caret line="63" column="16" selection-start-line="63" selection-start-column="16" selection-end-line="63" selection-end-column="16" />
-        </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" />
@@ -349,9 +377,6 @@
     <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/icon.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>
@@ -403,9 +428,7 @@
         </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/auth.js" />
     <entry file="file://$PROJECT_DIR$/src/api/req.js">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -425,13 +448,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="90">
-          <caret line="6" selection-start-line="6" selection-end-line="7" />
-        </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">
@@ -459,13 +475,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="380">
-          <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$/package.json">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -476,13 +485,6 @@
         </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="30">
-          <caret line="2" column="9" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="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="105">
@@ -510,16 +512,6 @@
         </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="527">
-          <caret line="83" column="34" selection-start-line="83" selection-start-column="32" selection-end-line="83" selection-end-column="34" />
-          <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">
@@ -530,40 +522,9 @@
         </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="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/auth/login.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="73" column="25" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="25" />
-          <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/pages/member/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" selection-end-line="159" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/pages/member/index.scss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-line="135" selection-end-column="1" />
-        </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="330">
@@ -574,10 +535,166 @@
         </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="-19">
-          <caret line="116" column="21" lean-forward="true" selection-start-line="116" selection-start-column="21" selection-end-line="116" selection-end-column="21" />
+        <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>
@@ -586,41 +703,18 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/pages/member/integral.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="29" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="29" />
+        <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/member/integral.scss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="681">
-          <caret line="46" lean-forward="true" selection-start-line="46" selection-end-line="46" />
-        </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/app.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="30" column="30" lean-forward="true" selection-start-line="30" selection-start-column="30" selection-end-line="30" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#46#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="240">
-          <caret line="16" column="3" lean-forward="true" selection-start-line="16" selection-start-column="3" selection-end-line="16" selection-end-column="3" />
+        <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>
diff --git a/src/app.js b/src/app.js
index ce38ea24a..65b1c6021 100644
--- a/src/app.js
+++ b/src/app.js
@@ -26,6 +26,7 @@ class App extends Component {
       'pages/category/index',
       'pages/auth/login',
       'pages/auth/reg',
+      'pages/auth/forgotpwd',
 
       'pages/member/index',
       'pages/member/favorite',
diff --git a/src/assets/fonts/iconfont.ttf b/src/assets/fonts/iconfont.ttf
index 62700264047cc6b27b29dc23cc3dff4e29e4eb07..635835e5b3e2c48a2860e47e5290ce3eb86ef2a0 100644
GIT binary patch
delta 1466
zcmZ8hTWB0*6h7yl*_qk<eI_QGrP;~N+_OnGP}|K`Yc5bR#aQv7nC)hpP0a4bWLFc3
zZYZ_*A|!4fiYP)`yu64uKKLLdV7w4iES8$$g*?a~Xu&4~3cB&kj$(C&??2c7obUWU
zGrMhTJ!=i6=f}PSz!d;EmC7dPx%$gj0IZd;Jw3O4_VKIDcL6Mi0Nn3q(#fg7xk5kX
z?h;}dawwAUGwB}_8Z+6#(y8mD0p6r#VlJObwyv~)0U-WLc1Je3G>`32rg#n6hjPhm
zx+XqRc>y5s4K>Wp=NAjFz1jadfR<SQsAVV!XcVJV?Z*C7?j!qP7s&yz^Ts9Tzw+R1
zu~m4MYz3I%rN`J8EQc|P4dqoliemXXK2ZJ<9p&FK_T+Xo4zLA6RqG&WqfOf&!X?^S
z10M1yT;vLO^BUgG6Z|yK^YeSfy{&@-fNI3SegBV?Z!qm)r2WPlhPMB_Ks7~hfD>Hc
zrVd{4QCA845CA*K#2sk@D_Dq$M3sIk?=pMI@y|Ghq)h5<f~o;mOi*3mlxcuE0H@P2
zK)rywOi)+gZWGiWxX%PJ0q!?JoPZlW2*eI}@VK#%LC3>Y6GR!fW`f8Ar^_@@CD%<l
zfd&GeFadITRjeK7=gB0{jIdWULDRzCmI-6->T?ZkIEgzf%HCr?2*bjM!X5D)@s6e6
z@}gx^V$ucaGx>tNv+<=EWF^tqBCN1aNI0PxqI7tAe;lJ>47f1Tg-wGka&yao9+c!3
zS#zNrMlFtmU5H)SLJFBKWUv}Ja{Nf7y5QydMCY;bbB{gLK2+P$gW~NgS8j{gUHKrp
z&e(dky5g#SSl17?4IAs{;iK*Kw$Tw=ecMoNWTIzoO%T@Rx+f~%vdPi0Nya9}MkhCZ
zk}9l3WZz|{ApysTXsin*nJ5vHE_9(rTx3br)aVfYt@g!n2-WByh5FRNICdjZrUX+P
z5H3rCUsWuhzWU0xq-b6y3qALbS(zfK)<;9fn!<wJq1fCktdHqo=CO(;!C@D|jSq$%
zp=?yfI(k{BO?3-4=T*D?Er*qPG^^OtaKfr7igMDgJJXJUh<00AmZxlXWMaTE<%|Tz
ztv=OyqM_IL+^W|m^s<`}0v$TxFpL;?Kr_)~dPEASTA!DuqETABrM@_8Zi=d!9!I|(
zX&&@8cvVSoVLb-aXzVEVHxJ%x2;P^4kyvb$U3B_<&X^EN{E-N;0jD2*mAiFK>?NUb
zeg8fu(y`dSc6dCR$8**c?1_P4#Nh#7oewJ)O&w=D(HHW^^}0I!&s&i&&Q>mlB6t%0
zu1&Y!@7{Fz@g5yEZdt##VX%BH&{)C%22llhF<mIk<fg?;dT!n_lgj5}(sSvVrJ0=c
z%t9(Zl@?RUg@R)I`U*4ooV=XO%~HC&m`UbRnW7~{k*CFMI#-m=B=gh7yfB|!mQ(pG
oxeDT9A-P~FWQy4{aweafrVL9qpGz-`i}p-@UMw!A7wE+Q0-1O-!vFvP

delta 811
zcmX|<KTH!*9LK-!dc9UCR8No&YHC7+7-RigHU48179EITA?7Ftt!eKn9D+oxaWIlN
zRBv%`G@2L&V;6^pMMm5(I@AOl9)odka553UukY|RpZELS@BRLK-(Bm+H;&W~)gBCg
z1H?T5HwqP}ns2Sm1IB*xWV(EJ>Qi><Ct$7tU86<Une3^3zr)-Ok}oolv|^j|o20*3
z2^L0H=s~P=yIS@OPWIM;W2}G0=ff3ep(+Lu@;t-mtmjnR%;nL)_W?W0ft9L18{kXs
zBhXWS_F>?P4Z%F}W8~e^&Gg0J=rkDszP`N1t~+-7jX4-os**5NluOmw;X&buf$*WY
zB$DBZxDdvT{P1%740w%L+dE3z!GdL&SX5Qm&4?kBGA%PQCx_&?^tV>Gw*kgd(%y-M
zb))yZV7`qE`v3pH>Rs&Ei4?lfjWiO7v*#YFv#3vS4usYCWf-Ey9JN~Q9n9ej4ZA?{
zRKb3bT^glTc565TGObaaq^;px$h{gWfb7vw3uLc`svv9oxDg73?9)&xBtMU$EhtBy
zP(I|4h8KYx*Qi%6eT{mdTdNv%O|JK%Lp%~KW6XGLG-HdgrfHei&FAKNd@TOLvc{~p
zKqDLPH5!|VKStwe>T`#%!->BB8WOW^5R|-Wv*?zq*1TI<D0$ZHnSwv*rb-3hoASM&
z;LHR`^*;+rzL%UWmKKXXD=MxxXH7W%^qim2=0s#qM)p)>Pe=AlWb=_d+Zj3Mc!_^2
Cdc1)E

diff --git a/src/assets/fonts/iconfont.woff b/src/assets/fonts/iconfont.woff
index 83df79af7d1a20e8155c5579b37b4560ae53b558..8483b226ed43ae762be6147ad1cb7cf0cddf3797 100644
GIT binary patch
delta 3761
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
b(VnTD4i%Z)D3j-2mgEK@zJNk5=l}o!6^r?$

delta 3248
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

diff --git a/src/pages/auth/forgotpwd.js b/src/pages/auth/forgotpwd.js
new file mode 100644
index 000000000..fe3f18fd6
--- /dev/null
+++ b/src/pages/auth/forgotpwd.js
@@ -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>
+    )
+  }
+}
diff --git a/src/pages/auth/forgotpwd.scss b/src/pages/auth/forgotpwd.scss
new file mode 100644
index 000000000..6bed63c7f
--- /dev/null
+++ b/src/pages/auth/forgotpwd.scss
@@ -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;
+    }
+  }
+}
diff --git a/src/pages/auth/login.js b/src/pages/auth/login.js
index 4f47f5bd4..aceeb1503 100644
--- a/src/pages/auth/login.js
+++ b/src/pages/auth/login.js
@@ -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>
diff --git a/src/pages/auth/login.scss b/src/pages/auth/login.scss
index edd3db916..c84616f61 100644
--- a/src/pages/auth/login.scss
+++ b/src/pages/auth/login.scss
@@ -12,6 +12,9 @@
     background: #fff;
     padding: $edge-size;
     margin: 0 0 $edge-margin;
+    .icon-pwd {
+      line-height: 40px;
+    }
     .forgotPwd{
       font-size: 28px;
     }
diff --git a/src/pages/auth/reg.js b/src/pages/auth/reg.js
index 3705acfdc..d3caa2225 100644
--- a/src/pages/auth/reg.js
+++ b/src/pages/auth/reg.js
@@ -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 />
diff --git a/src/pages/index/index.js b/src/pages/index/index.js
index 84234bbc9..e303bc207 100644
--- a/src/pages/index/index.js
+++ b/src/pages/index/index.js
@@ -11,7 +11,7 @@ export default class Index extends Component {
   componentWillMount () {
     if (process.env.NODE_ENV === 'development') {
       Taro.redirectTo({
-        url: '/pages/auth/reg'
+        url: '/pages/member/integral'
       })
     }
   }
diff --git a/src/pages/member/integral.js b/src/pages/member/integral.js
index 01c0222b1..4c39097d3 100644
--- a/src/pages/member/integral.js
+++ b/src/pages/member/integral.js
@@ -1,25 +1,133 @@
 
 import Taro, { Component } from '@tarojs/taro'
-import { View, Text } from '@tarojs/components'
-import { AtBadge, AtIcon, AtAvatar } from 'taro-ui'
-import { SpIconMenu, TabBar } from '@/components'
+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 {
-  navigateTo (url) {
-    Taro.navigateTo({ url })
+  constructor (props) {
+    super(props)
+
+    this.state = {
+      ...this.state,
+      curTabIdx: 0,
+      tabList: [
+        {title: '全部', status: ''},
+        {title: '收入', status: 'INCOME'},
+        {title: '支出', status: 'EXPEND'}
+      ],
+      list: [],
+      isLoading: false
+    }
   }
 
-  componentDidShow () {
+  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-index'>
-        <View className='member-index__hd'>
-          <View className='member-info'>
-            <View className='member-name'>鲜果优格果冻妹</View>
+      <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>
diff --git a/src/pages/member/integral.scss b/src/pages/member/integral.scss
index aa036f890..7711bd950 100644
--- a/src/pages/member/integral.scss
+++ b/src/pages/member/integral.scss
@@ -1,6 +1,6 @@
 @import '../../style/imports';
 
-.page-member-index {
+.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));
@@ -22,7 +22,7 @@
   }
 }
 
-.member-index {
+.member-integral {
   &__hd {
     background: #FA3515;
     background: linear-gradient(180deg,rgba(#FA9461, 1) 0%,rgba(#FA3515, 1) 100%);
@@ -44,3 +44,79 @@
     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;
+  //  }
+  //}
+}
diff --git a/src/style/icon.scss b/src/style/icon.scss
index a7f99b28d..81fc3a575 100644
--- a/src/style/icon.scss
+++ b/src/style/icon.scss
@@ -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";
-}
\ No newline at end of file
+}
+