diff --git a/mall4m/pages/login/login.js b/mall4m/pages/login/login.js
index 827b87a..522d8a4 100644
--- a/mall4m/pages/login/login.js
+++ b/mall4m/pages/login/login.js
@@ -109,6 +109,7 @@ Page({
    * 注册/登录按钮
    */
   handleLoginOrRegister() {
+    const that = this
     if (!this.data.userName.trim()) {
       wx.showToast({
         title: '请输入用户名',
@@ -132,9 +133,22 @@ Page({
       },
       callBack: (res) => {
         wx.setStorageSync('token', res.accessToken)
-        wx.switchTab({
-          url: '/pages/index/index',
-        })
+        if(this.data.isRegister) {
+          that.setData({
+            userName: '',
+            password: '',
+            isRegister: !that.data.isRegister
+          })
+          wx.showToast({
+            title: '注册成功，请登录',
+            icon: 'none'
+          })
+        }else {
+          wx.switchTab({
+            url: '/pages/index/index',
+          })          
+        }
+
       }
     };
     http.request(params);
diff --git a/mall4m/pages/login/login.wxml b/mall4m/pages/login/login.wxml
index d862593..357d3d7 100644
--- a/mall4m/pages/login/login.wxml
+++ b/mall4m/pages/login/login.wxml
@@ -5,13 +5,13 @@
     <view class="item">
         <view class="account">
             <text class="input-item">用户名</text>
-            <input type="text" data-type="account" placeholder-class="inp-palcehoder" placeholder="请输入用户名" bindinput="getInputVal"></input>
+            <input type="text" data-type="account" placeholder-class="inp-palcehoder" value="{{userName}}" placeholder="请输入用户名" bindinput="getInputVal"></input>
         </view>
     </view>
     <view class="item">
         <view class="account">
             <text class="input-item">密码</text>
-            <input type="password" data-type="password" placeholder-class="inp-palcehoder" placeholder="请输入密码" bindinput="getInputVal"></input>
+            <input type="password" data-type="password" placeholder-class="inp-palcehoder" value="{{password}}" placeholder="请输入密码" bindinput="getInputVal"></input>
         </view>
     </view>
     <view>