From cc2fb64a6eb61dca6b767886dd18e8b8f1e5618a Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Thu, 11 Jul 2019 15:30:53 +0800
Subject: [PATCH] =?UTF-8?q?chore[litemall-vue]:=20=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=A7=BB=E5=88=B0=E7=94=A8=E6=88=B7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/user/tabbar-user-header.vue        |  6 ++----
 litemall-vue/src/views/user/tabbar-user.vue      |  8 --------
 .../views/user/user-information-set/index.vue    | 16 +++++++++++++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/litemall-vue/src/views/user/tabbar-user-header.vue b/litemall-vue/src/views/user/tabbar-user-header.vue
index 185df051..cd633c0a 100755
--- a/litemall-vue/src/views/user/tabbar-user-header.vue
+++ b/litemall-vue/src/views/user/tabbar-user-header.vue
@@ -41,7 +41,7 @@ export default {
         'nickName',
         'avatar'
       );
-      this.avatar = avatar_default;
+      this.avatar = infoData.avatar || avatar_default;
       this.nickName = infoData.nickName || '昵称';
     },
     toSetting() {
@@ -53,17 +53,15 @@ export default {
 
 <style lang="scss" scoped>
 .user_header {
-  position: relative;
   background-repeat: no-repeat;
   background-size: cover;
   height: 130px;
-  box-sizing: border-box;
   text-align: center;
   color: #fff;
   padding-top: 30px;
 }
 
-i.user_set {
+.user_set {
   position: absolute;
   top: 10px;
   right: 10px;
diff --git a/litemall-vue/src/views/user/tabbar-user.vue b/litemall-vue/src/views/user/tabbar-user.vue
index 27d48694..6dca0b9d 100755
--- a/litemall-vue/src/views/user/tabbar-user.vue
+++ b/litemall-vue/src/views/user/tabbar-user.vue
@@ -4,7 +4,6 @@
     <order-group/>
     <coupon-group/>
     <user-module/>
-    <van-button size="large" class="tabbar-user__quit" v-if="isLogin" @click="quit">退出当前账户</van-button>
   </div>
 </template>
 
@@ -14,9 +13,6 @@ import orderGroup from './tabbar-user-order';
 import couponGroup from './tabbar-user-coupon';
 import userModule from './tabbar-user-module';
 
-import { removeLocalStorage } from '@/utils/local-storage';
-import { authLogout } from '@/api/api';
-
 export default {
   data() {
     return {
@@ -29,10 +25,6 @@ export default {
   },
 
   methods: {
-    quit() {
-      authLogout();
-      this.$router.push({ name: 'login' });
-    },
     getLoginStatus() {
       this.isLogin =
         !!localStorage.getItem('Authorization');
diff --git a/litemall-vue/src/views/user/user-information-set/index.vue b/litemall-vue/src/views/user/user-information-set/index.vue
index 127c66c2..de907607 100755
--- a/litemall-vue/src/views/user/user-information-set/index.vue
+++ b/litemall-vue/src/views/user/user-information-set/index.vue
@@ -19,7 +19,9 @@
       <van-cell title="密码设置" to="/user/information/setPassword" isLink/>
       <van-cell title="手机号" to="/user/information/setMobile" :value="mobile" isLink></van-cell>
     </van-cell-group>
-    <van-button class="bottom_btn" @click="loginOut" type="primary" bottomAction>退出登录</van-button>
+
+    <van-button size="large" class="user_quit" @click="loginOut">退出当前账户</van-button>
+
     <van-popup v-model="showSex" position="bottom">
       <van-picker
         showToolbar
@@ -82,8 +84,13 @@ export default {
       })
     },
     loginOut() {
-      authLogout();
-      this.$router.push({ name: 'home' });
+      authLogout().then(res => {
+        removeLocalStorage('Authorization')
+        removeLocalStorage('avatar')
+        removeLocalStorage('nickName')
+        this.$router.push({ name: 'home' });
+      });
+
     }
   },
 
@@ -117,5 +124,8 @@ export default {
       color: $border-color;
     }
   }
+  .user_quit {
+    margin-top: 20px;
+  }
 }
 </style>