From 30d7d6af74ac79e523fc831013fd805cf65b98a0 Mon Sep 17 00:00:00 2001
From: "zhigang.li@tendcloud.com" <zhigang.li@tendcloud.com>
Date: Tue, 9 Oct 2018 14:21:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=B7=BB=E5=8A=A0=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=AF=BC=E8=88=AA=E5=8F=B3=E4=BE=A7=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=EF=BC=8C=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E8=BF=98=E6=94=AF=E6=8C=81=E5=9C=A8=E6=A0=87=E7=AD=BE=E4=B8=8A?=
 =?UTF-8?q?=E5=8F=B3=E9=94=AE=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/components/tags-nav/tags-nav.less        |  4 ++--
 .../main/components/tags-nav/tags-nav.vue         | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/main/components/tags-nav/tags-nav.less b/src/components/main/components/tags-nav/tags-nav.less
index ee31f9161..a4c8c5dbe 100644
--- a/src/components/main/components/tags-nav/tags-nav.less
+++ b/src/components/main/components/tags-nav/tags-nav.less
@@ -42,14 +42,14 @@
       left: 0px;
     }
     &.right-btn{
-      right: 0px;
+      right: 32px;
       border-right: 1px solid #F0F0F0;
     }
   }
   .scroll-outer{
     position: absolute;
     left: 28px;
-    right: 28px;
+    right: 61px;
     top: 0;
     bottom: 0;
     box-shadow: 0px 0 3px 2px rgba(100,100,100,.1) inset;
diff --git a/src/components/main/components/tags-nav/tags-nav.vue b/src/components/main/components/tags-nav/tags-nav.vue
index 369f3cec0..242f83687 100644
--- a/src/components/main/components/tags-nav/tags-nav.vue
+++ b/src/components/main/components/tags-nav/tags-nav.vue
@@ -1,5 +1,16 @@
 <template>
   <div class="tags-nav">
+    <div class="close-con">
+      <Dropdown transfer @on-click="handleTagsOption" style="margin-top:7px;">
+        <Button size="small" type="text">
+          <Icon :size="18" type="ios-close-circle-outline" />
+        </Button>
+        <DropdownMenu slot="list">
+          <DropdownItem name="close-all">关闭所有</DropdownItem>
+          <DropdownItem name="close-others">关闭其他</DropdownItem>
+        </DropdownMenu>
+      </Dropdown>
+    </div>
     <ul v-show="visible" :style="{left: contextMenuLeft + 'px', top: contextMenuTop + 'px'}" class="contextmenu">
       <li v-for="(item, key) of menuList" @click="handleTagsOption(key)" :key="key">{{item}}</li>
     </ul>
@@ -95,11 +106,11 @@ export default {
       }
     },
     handleTagsOption (type) {
-      if (type === 'all') {
+      if (type.includes('all')) {
         // 关闭所有，除了home
         let res = this.list.filter(item => item.name === 'home')
         this.$emit('on-close', res, 'all')
-      } else if (type === 'others') {
+      } else if (type.includes('others')) {
         // 关闭除当前页和home页的其他页
         let res = this.list.filter(item => routeEqual(this.currentRouteObj, item) || item.name === 'home')
         this.$emit('on-close', res, 'others', this.currentRouteObj)